Trailing whitespaces highlight and jshint
Fixed json
Merge branch 'master' of github.com:zqsd/dotfiles