Clean up after disk tests
Fix some deadlocks discovered in swarm tests
Merge pull request #42 from c00w/master

Testsuite cleanups
Implement statejoin & fix related bugs
Merge pull request #43 from c00w/join

Implement statejoin & fix related bugs
Add HandleMessage() function for NetworkMultiplexer
Merge remote-tracking branch 'upstream/master'