clean up: remove demandware.orig.json and change branch fluidstorefront gets checked out from