Disable jshint
Merge branch 'master' of github.com:tmadsen/.vim

Conflicts:
	vimrc
Don't check for errors on write with syntastic.