Enhancements to grunt build