Don't use a symlinked htmlcup.coffee
Merge branch 'master' into gh-pages