mako bootstrap removed jinja
Merge branch 'master' into 0.1.0

* master:
  mako bootstrap removed jinja