Added to feature list in README.
Switched to highlight.js.
Merge branch 'master' into demo