Some design fixes for "overwrite wallet" warning.
Update upstream (adds Account class subscription handling.)
Use Account class to subscribe to account instead of rolling our own.