matches what is on develop branch
conf matches develop branch...just making sure my personal changes don't affect rapidsms