Don't attempt to remove a failed job if it's already been deleted
Merge branch 'master' into auto-473-assertion-error-fix

Conflicts:
	otter/test/test_controller.py
Merge pull request #282 from rackerlabs/auto-473-assertion-error-fix

Auto 473 assertion error fix