Moves vividchalk to submodule
Indentguides as submodule
Updated settings for python
Merge remote-tracking branch 'origin/master' into master

Conflicts:
	.gitmodules
Ultisnips (which replaces snipmate)
Delimitmate as submodule
Moved jellybeans to submodule