Add state to gatherers and track when a gatherer has left or is away
Merge remote-tracking branch 'jamal/develop' into develop