single instance of hammer per scope, gesture array more readable
Merge branch 'master' into gh-pages