ycm works, p4diff is much better
remove custom vim
dont manually do xmodmap for now
add securemodlines vim bundle
display more repo types in prompt
script to update google-vim to head