Simplified Gruntfile, Minor Bug Fixing