Some vimrc and vundle changes
Move out specific settings to .bbbash_profile
Only set screen PROMPT_COMMAND if actually running in screen
Use git diff style 3 (incoming, merge ancestor, working copy)