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

Server password
make travis do less
update cpanfile + snapshot for assetpack
Merge remote-tracking branch 'origin/master' into cleanup/form_block

Conflicts:
	lib/Convos/Core.pm
	lib/Convos/User.pm
	templates/event/connection.html.ep