Scala mode stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	init.el
Stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	init.el
Meta s hippie js
Init stuff
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	init.el

Stuff
Waher theme
Package npm snippet
Lorem snippet
Indentions works fine in js2 extended something