Brought tests up-to-date
Merge remote-tracking branch 'upstream/master' into tests
Removed postmortem, moved some logic from supervisor to match
Finished removing post-mortem and getting test suite to work
Merge pull request #9 from chirs/tests

Refactoring