Copy presence info to new roster after getContacts

Fixes issue #6
Includes unit test for this scenario, and minor tweaks/clarifications to
unrelated unit tests.