== 3.3.0
bundle exec cap
Merge remote branch 'origin/master'

Conflicts:
	config/sample_resque_manager.yml