Updates to starter Grunt setup. Cleanup and organization mostly.