Capistrano 3 migration
Tweak in deploy/production
Add whenever task to deploy.rb
Merge branch 'master' into cap3

Conflicts:
	Gemfile
	Gemfile.lock
Capistrano fix
Merge branch 'cap3'
Rails 4.0.1.rc4 migration