Patched up the client_notification package to use the new call id format.
Moved hangup and pickup to use the changed format.

Hopefully this is the last big refactoring of the internal workings of the PBX.