Updated vim to use vim-powerline and started moving across to vundle.
Other minor changes.
Simplify prompt and make git branch info more subtle.