Some stuff
Merge branch 'master' of https://github.com/G15N/vimrc

Conflicts:
	ftplugin/php.vim