moving around a few more things (as they were not wired up right anyway)
Merge branch 'master' into gh-pages
script writes git hash into js file