Javascript settings and font
Merge branch 'master' of ssh://fhtagn.net/home/silver/git_repos/vim

Conflicts:
	_vimrc