Modified Gruntfile, README and TODO