[master-election] simplified resign_as_master(), election timers are a bit more aggressive
Merge pull request #737 from portertech/master-election

Simplify resign_as_master() and make election timers more aggressive