Update bashrc PS1 to display git upstream status

* add new aliases to gitconfig