Merge pull request #322 from subvertallchris/rails4

attempts to take advantage of protected_attributes gem
Merge remote-tracking branch 'upstream/rails4' into rails4