Checkpoint commit, lots of broken tests still.
Uncomment some stuff.
Merge branch 'develop' into feature/adhoc-amqp-test-helper
Checkpoint commit, lots of broken tests still.
Merge branch 'develop' into feature/adhoc-amqp-test-helper

Conflicts:
	go/apps/bulk_message/tests/test_vumi_app.py
	go/apps/sequential_send/tests/test_vumi_app.py
	go/apps/subscription/tests/test_vumi_app.py
	go/base/models.py
	go/base/tests/utils.py
	go/vumitools/tests/utils.py
Fix some app tests.
Comment out imports as well as code in test utils.
Merge branch 'develop' into feature/adhoc-amqp-test-helper

Conflicts:
	go/apps/http_api/tests/test_vumi_app.py
More test updates.
Merge branch 'develop' into feature/adhoc-amqp-test-helper
All tests passing! \o/
Cleanup.
Rename FooTestCase to TestFoo across the board. Also a little more general cleanup.
Merge branch 'develop' into feature/adhoc-amqp-test-helper

Conflicts:
	go/base/tests/test_go_manage_metrics.py
	go/vumitools/tests/test_app_worker.py
	go/vumitools/tests/test_metrics_worker.py
Merge branch 'develop' into feature/adhoc-amqp-test-helper

Conflicts:
	go/apps/subscription/tests/test_definition.py
Merge branch 'develop' into feature/adhoc-amqp-test-helper

Conflicts:
	go/base/tests/test_go_manage_applications.py
	go/base/tests/test_utils.py
	go/base/tests/utils.py
	go/conversation/tests.py
Merge branch 'feature/issue-786-test-helpers-vumitools' into feature/adhoc-amqp-test-helper

Conflicts:
	go/apps/jsbox/tests/test_views.py
	go/conversation/tests.py
	go/vumitools/tests/test_metrics.py
	go/vumitools/tests/test_metrics_worker.py
	go/vumitools/tests/test_routing.py
Merge branch 'feature/issue-786-test-helpers-vumitools' into feature/adhoc-amqp-test-helper
adding search to contacts resource
Merge branch 'feature/issue-786-test-helpers-vumitools' into feature/adhoc-amqp-test-helper

Conflicts:
	go/apps/surveys/tests/test_views.py
	go/apps/wikipedia/tests/test_vumi_app.py