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
Change host_name to hostname in Vagrantfile
Fix turbolinks loading caption _cache_ problem
Remove useless responds_withs
Merge ../x0y0

Conflicts:
	Gemfile.lock
	Vagrantfile
	app/controllers/users_controller.rb