Merge branch 'develop' into feature/issue-197-bootstrap-prod-env
Merge branch 'feature/issue-197-bootstrap-prod-env' of github.com:praekelt/vumi-go into feature/issue-197-bootstrap-prod-env