Bugfixes for Unix import script, add_contact.  New test cases added
Merge branch 'master' of https://github.com/andrewmcc/serverdb