Fixed Grunt's jshint tasks to be able to merge options, according to https://github.com/gruntjs/grunt-contrib-jshint/pull/24#issuecomment-14976842
Merge branch 'fix/grunt-contrib-jshint-options' of github.com:RomanMinkin/socketstream into RomanMinkin-fix/grunt-contrib-jshint-options