Add git branch to prompt
Switch back to vundle. It just works.

Also remove lots of unused cruft.