Cleaned up, Grunt Taks added and package.json fixed