Refactor some more models

Grouping attribute constraints, and updating some queries for Rails 4.
Merge branch 'finders6' of https://github.com/ferrous26/Markus into finders6
Hound complaints