docker and go changes
Merge branch 'master' of https://github.com/brnstz/homedir

Conflicts:
	.bash_profile