Ensure election timeout gets reset properly
Updating formatting
Merge branch 'handle-server-exceptions' into travis-random-testing