add markdown support
allow markdown template to come from file
Merge branch 'master' into feature/markdown