Merge pull request #13 from jessereynolds/threading_restructure

Fix shutdown when running undaemonized
Update simulate-failed-check