General updates

I added a SimpleCatcher which is a single machine catcher farm.  This should massively simplify the demo and allows me to defer debugging the more complex servers.