Jshint

Proper config merge and jshint compatibility fixed.