Added mixed mode. Allows MUC but enforces OTR on the rest.

Signed-off-by: David Goulet <dgoulet@ev0ke.net>
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod_otr.lua