Changes to if statatement for hostname
Merge branch 'master' of github.com:zatan/dotbashrc

Conflicts:
	.bashrc