txels/pretenders — pull request #21 by txels (2012-07-04 22:08:30+00:00)
Title: Complete server splitup

@alexcouper this completes the tasks in first section.
Tests pass in my machine. We may be a bit short of unit tests...