Support using OTR by default
Order options alphabetically
Merge branch 'otr-by-default' of git://github.com/Aupajo/converse.js into Apajo-otr-by-default

Conflicts:
	converse.js

Fixes #102