Updated to Rails 4.1
Follow Rails 4.1 conventions