Upgraded protected_attributes for Rails 4.0.4 upgrade
Ran annotate - updated several models and specs