Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:bluesmoon/boomerang into gh-pages