Simplified account configuration

Now there is only one file for each account, which can contain details for both imap and smtp.
Removed some cruft in the old mechanism and fixed the .txt~ backup turd bug.