Update from thoughtbot upstream

Fixes for git hooks