Changed syntax highlighter to use Prism
Merge branch 'master' into gh-pages

* master:
  Changed syntax highlighter to use Prism