[GATE-3] Big improvements in handling of adding/removing legacy contacts.  Still a bunch more things that need to be done though.  Getting there.  [love the slew of new handlers gato!]

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5215 b35dd754-fafc-0310-a699-88a17e54d16e