Cleaning up and making this a Happy Rails 4.0 Ruby 2.0 world