Merge commit 'aa7d91562c5e16f63c3142786a32edba58516c11'
Merge commit '6f5d1dfca5f6a5ec7c5b34371f22c5c49a30d350'
Merge remote-tracking branch 'rtbkit-rtbkit/master'
the router now uses the correct monitor tolerance default.
Merge pull request #216 from datacratic/upstream_06_10_2014

Upstream 06_10_2014
Merge remote-tracking branch 'rtbkit-rtbkit/master'

Conflicts:
	rtbkit/core/monitor/monitor_client.h