Added vim-puppet module
Merge branch 'master' of github.com:TimJones/vimrc

Conflicts:
	.gitmodules