Added new javascript syntax highlighting and some little tweaks.
Merge branch 'master' of https://github.com/rasmusx/dotfiles

Conflicts:
	vimrc