Merge branch 'capistrano_unicorn_nginx' of github.com:delbetu/store into capistrano_unicorn_nginx

Conflicts:
	config/deploy.rb
	config/deploy/production.rb
merge production.rb