Add a display name for users.

This branch is imported from the bzr branch which was reviewed.

Will get reviews here too