Update git-completion, add git-prompt, and reorder the bashrc so we source the git stuff first
Merge