1) whitespace
Merge branch 'master' of github.com:metamx/druid
1) Adjust DataSegment to have a binaryVersion field that indicates the expected binary version of the segment files
2) Eliminate race condition from RemoteTaskRunnerTest.testAlreadyExecutedTask()
1) Make BasePhoneBook not quite so zealous about throwing exceptions when things didn't line up exactly as it thought they should.