More work on settings
Merge branch 'master' into server_password
Fix setting irc server password
Remove duplicate
additional test to protect @jhthorsen's password
Merge pull request #25 from Nordaaker/server_password

Server password