Continued transition to grunt build