Fix the grunt build to work on subdirectories as-well.
Follow up on fix grunt build.
Merge with master