Require Jinja2 mode on html-markup.el.
Merge branch 'master' of github.com:peterhil/emacs-config

Conflicts:
	rc/html-markup.el