Addressing Nikhil's comments...
Merge branch 'worker' of github.com:esheffield/qonos into worker

Conflicts:
	qonos/tests/unit/worker/snapshot/test_snapshot.py