pkg dir
testdata
Merge pull request #3 from sourcegraph/master

latest from upstream