Restructured the Gruntfile to be "cleaner"