Merge branch 'master' into next

* master:
  * Add servers-ssl for later use
  * Remove irc.igs.ca

doc/settings.txt

@@ -42,7 +42,6 @@ irc.underworld.no
 #CA
 irc.arcti.ca
 irc.choopa.ca
-irc.igs.ca
 
 :servers6
 efnet.ipv6.port80.se
@@ -55,6 +54,18 @@ irc.ipv6.he.net
 irc.ipv6.homelien.no
 irc.paraphysics.net
 
+:servers_ssl
+efnet.xs4all.nl
+irc.blessed.net
+irc.choopa.ca
+irc.choopa.net
+irc.eversible.com
+irc.he.net
+irc.paraphysics.net
+irc.servercentral.net
+irc.shoutcast.com
+irc.umich.edu
+
 :rbl
 dnsbl.ahbl.org
 dnsbl.proxybl.org