Better TODOs.
pep8 fixes.
Merge branch 'feature/issue-786-test-helpers-vumitools' into feature/adhoc-amqp-test-helper