Merge pull request #6 from murrekatt/develop

Initial simplifications of OTServer