fixing gruntfile
Merge branch 'master' of github.com:e2tha-e/nbcuuomerch_fep_poc into cleanup-vars
updating config.rb to turn off comments as def, plus other settings