another log fix
fix to string error
some doc fixes
new docs on logging

Conflicts:
	docs/content/toc.textile
toc fix
doc for IngestSegmentFirehose
Merge pull request #654 from metamx/ingest-firehose-doc

doc for IngestSegmentFirehose
fix broken approx histo doc
query cancellation/timeout docs + missing items
cleanup docs template for preview
more docs
prepare for next release
[maven-release-plugin] prepare release druid-0.6.137
[maven-release-plugin] prepare for next development iteration
add timeboundary docs
Merge branch 'master' into druid-0.7.x