upgrade Rails to 3.14
Merge pull request #242 from gregmolnar/rails_upgrade

upgrade Rails to 3.14