Some cleanup in Fluid. I don't know what in main. Add the 'manifest' plugin to package and the Gruntfile.