better saving behavior for populating roster
Merge branch '2.2' of github.com:chrisballinger/Off-the-Record-iOS into 2.2

Conflicts:
	Off the Record/OTRRosterStorage.m