Single /catalog controller 

We should go through this carefully, but I think this fixes #580.
yes, down the road, but in this commit I'm just changing the first part of the url, and leaving that as-is.