rollback from dans templating
Merge branch 'master' of https://github.com/sudov/okra