Merge buteo-gcontact-plugin changes to the nemomobile repo