rebuild js with Alan's fix. Also, some styling.
Merge branch 'master' into gh-pages