a test-deployment commit
Merge branch 'master' into gh-pages
Merge branch 'master' of github.com:unphased/ply
Merge branch 'gh-pages' of github.com:unphased/ply into gh-pages
Merge branch 'master' into gh-pages