Modularity build

grunt build now works with the modularity branch.