Merge pull request #42 from bgrayless/rails_to_4_1

Rails to 4.1.0
Merge branch 'master' into add_enum_fields