JLF-10: Added support for multiple types in histogram.  Required refactoring of mocks which now use mock instead of mockito.  Need to remove mockito from the setup.py.  Still more to do on the mock refactoring to make it DRY.