fix qml mode
Merge remote-tracking branch 'origin/master'

Conflicts:
	.emacs
	.emacs.d/ac-comphist.dat