Merge pull request #1 from sourcegraph/master

catch up to master