Don't load the service catalog in the constructor
And make the load explicit
Merge branch 'master' of https://github.com/slipstream/SlipStreamServer