Passing bundle

This branch is to get master into rails 4 2, apply some Hound updates, and at least get the bundle passing.
Line is too long.