Grunt improvements, cleanups, and ultimate packageification!