Improved Gruntfile