Refactored TorrentProtocol a bit, also fixed error in TorrentClient
merged in blockWriting branch
Fixed some more compile errors
Merged refactor/protocol
Fixed weird merge artifact