added user and server to bash prompt
Merge branch 'master' of https://github.com/gabesoft/dotfiles