python indent plugin
cino+=N-s
better MatchParen highlighting
fugitive as submodule

Conflicts:
	.gitmodules
pydoc