1) Some whitespace changes
2) Fix up the alerting to actually include the segment and server for when the MasterBalancer has something stuck in the queue
Merge branch 'master' of github.com:metamx/druid