Merge pull request #4 from skyfoxs/master

Remove unnecessary module
Add grunt to package.json
add karma-cli for use in node_modules/.bin
Add grunt jshint
Resolve conflict
Merge branch 'wingyplus-master'
Fix package.json
Add grunt karma