Update build instructions to not pull source twice.

README.md

@@ -103,23 +103,15 @@ Go tools work accordingly. See [Setting GOPATH](https://github.com/golang/go/wik
 up your Go workspace. With a `GOPATH` set, the following commands will build hound locally.
 
 ```
-<<<<<<< HEAD
 git clone https://github.com/hound-search/hound.git ${GOPATH}/src/github.com/hound-search/hound
 cd ${GOPATH}/src/github.com/hound-search/hound
-=======
-git clone https://github.com/hound-search/hound.git ${GOPATH}/src/github.com/etsy/hound
-cd ${GOPATH}/src/github.com/etsy/hound
->>>>>>> Updated build instructions post-Etsy
 make
 ```
 
 If this is your only Go project, you can set your GOPATH just for Hound:
 ```
-git clone https://github.com/hound-search/hound.git
-cd hound
-export GOPATH=`pwd`
-go get github.com/etsy/hound/cmds/...
-make
+git clone https://github.com/hound-search/hound.git src/github.com/hound-search/hound
+GOPATH=$(pwd) make -C src/github.com/hound-search/hound
 ```
 
 ### Testing