Added client teardown state machine
Merge branch 'master' of https://github.com/isiloron/shiny-bear