[MINOR] jshint
Merge branch 'master' of github.com:eguzki/eguzki-vim-environment

Conflicts:
	.vimrc