align to style guidelines
mergy
Merge branch 'master' of github.com:sparkplug/rapidsms-generic