Correct language
Add syntax highlighting to links chapter
Merge branch 'master' into gh-pages