Fixed up Gruntfile and Package issues.