Added jshint to gulp and more packages to package.json
Merge fix