merged in jinja template move

Benjamin Mako Hill || Want to submit a patch?