Updated gruntfile so that dev should be debugable
Merge gruntfile