Dfoxpowell/adjusted gruntfile

Adjusted gruntfile and partial customer stories template
@dtothefp not sure if you saw this, but it looks like there's still a conflict in this file.