More jshint conf
vimrc tweaks
Merge branch 'master' of coarsesand.github:coarsesand/dotfiles

Conflicts:
	vimrc