Add vim-markdown submodule
added vim-puppet
add autocommand for twig-ish files
Merge remote-tracking branch 'origin'

Conflicts:
	.gitmodules

fucking submodules
add vim-scala submodule