simpler include for templating
Merge branch 'gh-pages'