Merge branch 'master' into gh-pages
including jss inside the source
script writes git hash into js file
Merge branch 'master' of github.com:unphased/ply
Merge branch 'master' into gh-pages
merging