Encode references so docco doesn't format them
Remove extra line
Merge branch 'master' into gh-pages
Rebuild docs