never put version numbers in minified js :)
Merge branch 'master' into gh-pages