Output syntax fixes, readme additions
Merge branch 'Production' into gh-pages