Add aol and Yahoo.

Yahoo requires imap, so change the code a little bit to support different protocols.