Merge account with server.

The account and server models were highly co-dependent. I merged them to
reduce their complexity.
Fix saving of server model.