some style reworking, and minify your own damn plugins
Merge branch 'master' into gh-pages