Final changes for refactored protocols. Unit tests not building.
Merge branch 'protocol-refactoring' of github.com:nessos/Thespian into protocol-refactoring