Better hostname
Merge branch 'master' of https://github.com/davetcoleman/unix_settings

Conflicts:
	.my.bashrc