Don't need any javascript at the moment.
Merge branch 'master' into gh-pages