work in progress...
Fixed a few things
Removed old grunt file
Fixed Gruntfile.js