Add vim-jinja syntax plugin.
Merge branch 'master' of github.com:brotatos/vim-config

Conflicts:
	vimrc