Show a different color for the hostname on a ssh connection
Merge branch 'master' into git-1.7