upgrade rails from 3.1.10 to 3.1.12 for security updates
merge to align with master
Merge pull request #92 from warneboldt/rails3.1.10_to_rails3.1.12

Rails3.1.10 to rails3.1.12