PEP8 and unused import clean ups.
Move heartbeat tests into conventional location.
Update test locations.
Merge branch 'feature/issue-487-better-worker-identification' of github.com:praekelt/vumi into feature/issue-487-better-worker-identification

Conflicts:
	vumi/blinkenlights/heartbeat/tests/test_monitor.py