use jshint and color column tweak
Merge branch 'master' of github.com:jphustman/vimfiles

Conflicts:
	.vimrc