Modify markdown to produce <code> instead of <pre>
Merge branch 'master' into gh-pages