Revert "Update for Rails 4 and Spree 2.1"

This reverts commit 68e7d14d08a20af7b27814bf7ca6c32470c6ad54.