PEP8
added another nack test, plus other cleanups
Merge branch 'feature/issue-627-trueafrican-ussd-transport' of github.com:praekelt/vumi into feature/issue-627-trueafrican-ussd-transport