Move mkcontact() into a base test case class for the contacts tests
Merge branch 'develop' of github.com:praekelt/vumi-go into develop