Add puppet bundle
Stop yankring from screwing with ma' macros!
Add less syntax
Merge branch 'master' of github.com:robgolding63/.vim

Conflicts:
	.gitmodules