Added php.vim plugin
Cleaned vimrc
Clean merge