Add demo; Fix demo buildout; Fix to deploy to root