Name some more threads/timers.  Issue #172
Merge branch 'master' into bonecp