Add git alias 'conflicts' and remove 'merged' and 'unmerged'
Update vimrc to use Vundle new syntax (Plugin instead of Bundle)
Add vim plugins for PHP and SVN
Add Syntastic config