adding puppet and drupal submodules.
Cleaning up stuff
Merge branch 'master' of https://github.com/grumps/vimconfig

Conflicts:
	.gitmodules