1) Fix bug with Master stopping trying to be Master after he losses it once
Merge branch 'master' of github.com:metamx/druid