Installed vim-javascript as submodule
Merge branch 'install-vim-javascript'
Set colorscheme vividchalk instead of solarized
Merge branch 'nitrous' of https://github.com/xamfoo/dotvim into nitrous

Conflicts:
	.gitmodules
	vimrc
Added vim-javascript as submodule