updates
Merge branch 'master' of github.com:zenhack/vim-config

Conflicts:
	.gitmodules
Remove duplicate python-mode submodule