Add user and host to prompt
Merge branch 'master' of github.com:jamesrampton/dotfiles