Rails 4.1 migration
Update config files to the Rails 4.1 way
Use figaro and env variables in application config
Add SECRET_KEY_BASE to application.yml
Fix capistrano config with ssh_options
Add Debian as our main distro
Add unicorn config for development environment
Add password_confirmation to filtered parameters
Debian 7
Rails 4.1.1 and no more assets in sandbox env
Ruby 2.1.2
Merge ../x0y0

Conflicts:
	Gemfile
	Gemfile.lock
	Vagrantfile
	app/mailers/user_mailer.rb
	config/application.travis.yml
	config/environments/sandbox.rb
	config/initializers/assets.rb
	config/initializers/session_store.rb
	config/secrets.yml