1. Changed indent style to 1TBS style
http://en.wikipedia.org/wiki/Indent_style#Variant:_1TBS

2. Changed (successfully) to using a map of Histograms without
crashing on finalization.

3. General clean-up for running on cluster.  No profiling has been
done, so I don't expect any sort of performance gains.