Addressbook changes per Greg Moser

Please organize the properties without this "ToDo" and without all the extra lines between them.  We keep all properties organized alphabetically within their like types.