Setting filetype to php for drupal files without the extension
Merge branch 'master' of https://github.com/sprinkles/dotvim

* 'master' of https://github.com/sprinkles/dotvim:
  Adding a check to install vundle, if it's missing. Disabling some bundles, but leaving them there to remind me to check them out

Conflicts:
	vimrc