Passing bundle

This branch is to get master into rails 4 2, apply some Hound updates, and at least get the bundle passing.
Identifier 'option_value_search' is not in camel case.