simplified includes
simplified include schema

all variables are now active in a single include
Merge branch 'gh-pages'