jshintrc "extends" fix - for master

switched the _.extend call to _.defaults, as to properly provide the intended benefit, adjusted the tests to ensure that the files are merged properly