Add Django syntax highlighting
Merge branch 'master' of github.com:telotortium/vimrc

Conflicts:
	.gitmodules