Even though I fork someone else's repo, I usually work under $GOPATH/src/github.com/<originalRepoOwner>/<repoName>. It allows me to avoid import nastiness :) Could you revert it yourself before we merge?