Removed username reference from Contact entries.

This feature is not useful without the messages feature.
Also cleaned up the contacts class a bit, and fixed some bugs
that have been present for a while.