Merge remote-tracking branch 'upstream/jacob'

Conflicts:
	commands.lua
	plugins/ircmodes.lua
Merge branch 'master' of github.com:wolfy1339/WolfyBot