Add markdown formatting via marked
Merge branch 'master' into single-template