partial convert to grunt0.4
Grunt 4 upgrade complete; tests all passing