Merge pull request #376 from Masterminds/fix-context

Fixes #373: Go 1.7 context package import issues