Cleanup some grunt-related configs
- New behavior with respect to abbreviation. Is now in the global config
- Samples updated