Merge pull request #230 from ceph/wip-mon-paxos-fixes

Wip mon paxos fixes

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/mon/PaxosService.h
Simple merge