Switch to Capistrano 3.0.
Example crontab and maintenance page for cap deploy
Update cap dependencies
Improve cap instructions in README
Merge branch 'master' into rails-3-2

Conflicts:
	Gemfile.lock
	config/deploy.rb