Updated for Rails 3.2.13 and bundle update