fix type maybe?
Merge branch 'master' into gh-pages
tweak fabfile
Merge branch 'master' into gh-pages