Added the ability to add keys, and search users by their public key.
Merged with Mike's changes.