prepared
git pushMerge branch 'gridifier' of github.com:foursquare/twofishes into gridifier