Workflow updates

Updates Gruntfile and package.json for better workflow.