changed gruntfile, updated js