Consolidate some changes into .jshintrc