Put php into passive filetypes of syntastic
Update vim bundles
Merge branch 'master' of github.com:everzet/dotfiles

Conflicts:
	vim/vimrc