Include Tom\'s refactored Gruntfile and package.json