bump rails [CVE-2014-7829]
Merge pull request #1101 from lonelyplanet/rails-3-2-21

bump rails [CVE-2014-7829]