Cleanup vimrc a bit
use a more complete bashprompt w/ git branch