Added JavaScript support and multi-cursor mode
Merge remote-tracking branch 'origin/master'

Conflicts:
	init.el