Added logic and tests for handling job updates and timeouts.
Merge branch 'master' of git://github.com/rackspace-titan/qonos into worker
Addressing Nikhil's comments...
Addressing Nikhil's comments...
Merge branch 'worker' of github.com:esheffield/qonos into worker

Conflicts:
	qonos/tests/unit/worker/snapshot/test_snapshot.py
Merge pull request #52 from esheffield/worker

Added logic and tests for handling job updates and timeouts.
Merge pull request #56 from esheffield/metadata_new

Update metadata handling to be consistent with Compute