Simplifying $GOPATH use in Makefile
Linking other tory executables as though they were go binaries
Removing primaryIp (and switching to ips.0 where applicable)
Merge remote-tracking branch 'origin/master' into minor-changes

Conflicts:
	bin/tory-sync-from-joyent
Merge pull request #43 from modcloth/minor-changes

Minor changes