generalized histogram construction
Merge branch 'master' of github.com:alexis-s/alexis-exo

Conflicts:
	testScripts/mcComparisonScript.py