Updates to Gruntfile to reduce tasks