Added abbreviation qq for tabclose.

Conflicts:
	.vimrc
Added scala.
HTML and JS and JSON.