Test, test, test...
compress and deploy
Merge branch 'master' into gh-pages