Some changes. Too tired
Merge branch 'master' of github.com:wizardfrag/ircone

Conflicts:
	src/cli.js