Rails 4.0.4
Rails 4.1 migration
Update config files to the Rails 4.1 way
Merge ../x0y0

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/sandbox.rb
	config/environments/test.rb
	config/initializers/email.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
Use figaro and env variables in application config
Add SECRET_KEY_BASE to application.yml
Merge ../x0y0 into rails-4-1

Conflicts:
	Gemfile
	config/application.travis.yml
	config/initializers/email.rb
	config/secrets.yml
Merge ../x0y0 into rails-4-1