Multiple improvements (git, bash, Vim)

Reconfigure git to use p4 as visual diff/merge tool
Updated prompt to use abbreviated paths
Prepare to add powerline to Vim
Add .gitignore to avoid uploading Vim swap files