Working on some angular/node code so adding syntax highlighting for
components
Merge branch 'master' of github.com:maverick2000/vim3000

Conflicts:
	vimrc