Merge pull request #2115 from gwagener/1-0-stable

Updated Rails version for security fix and limited new gems that breaks tests
rescue NoMethodError for dalli>2.x

fixes #2130
Merge pull request #2167 from sbeam/1-0-stable

rescue NoMethodError for dalli>2.x
Bumped Rails version for CVE-2013-0333 and fixed escaping issue caused by new Rails.