Rest discovery

I deleted the discovery branch that was based off the zurihac branch. This one is based off master.