Merge pull request #157 from garyburd/master

Fix issues in gosrc