Tweak to bash_aliases and .ssh/config
Merge remote-tracking branch 'origin/master'

Conflicts:
	.ssh/config