No more fixed version for capistrano-rbenv
Use encrypted cookie for auth_token
Merge ../x0y0

Conflicts:
	.travis.yml
	Gemfile.lock
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb