ntlm: Updated comments for the addition of SASL support to IMAP in v7.29
SOCKS: fix socks proxy when noproxy matched

Test 1212 added to verify

Bug: http://curl.haxx.se/bug/view.cgi?id=1190
email: Post STARTLS capability code tidy up (Part Two)

Corrected the order of the pop3_state_capa() / imap_state_capability()
and the pop3_state_capa_resp() / imap_state_capability_resp() functions
to match the execution order.
email: Post STARTLS capability code tidy up (Part Three)

Corrected the order of the upgrade_tls() functions and moved the handler
upgrade and getsock() functions out from the middle of the state related
functions.