pep8 fixes
s/safaricom/airtel/
Merge branch 'feature/issue-528-airtel-cleanup' into develop