Merge lastest thoughtbot changes
add dispatch/turbox