Merge branch 'master' into gh-pages
bump
Merge branch 'gh-pages' of github.com:adewinter/twitter into gh-pages