simplifying go root
Merge branch 'master' of github.com:heckj/dotfiles
Merge branch 'master' of github.com:heckj/dotfiles

Conflicts:
	bash_profile
gopath