update deps and import paths
Merge pull request #21 from sourcegraph/update-deps

update deps and import paths