Update .bashrc

fixes whitespace issues and adds some git goodies