Merge branch 'config-refactor' into kupo

Conflicts:
	rooms.js
	sockets.js
Style cleanup
Move some commands to chat-plugins
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/commands.js
	rooms.js
	sockets.js