Added p4 support to vimrc
Added git branch PS1 and history changes to .bashrc