bumping stuff for 0.2.2
Merge remote-tracking branch 'origin/gh-pages' into gh-pages