Simlify config handling and mode switching
Remove process.nextTick usage
Redesign the way activities stop
Merge branch 'simplicity'