path fixes and cleanup for the grunt build.