Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master', remote-tracking branch 'origin'
Alias ssh-add so keys expire after 12 hours
Set PS1 colour based on user and hostname