Revamp contact nick handling (+ minor s2c changes)

- Contact nickname handling has been completely revamped, and now
  properly deals with things like nick collisions.
- In addition, the source of nickname information is now recorded,
  meaning that WhatsApp notify / contact name changes now propagate
  to the nickname changing, if the relevant option is enabled.