Clean up bashrc; add git-prompt stuff