Old Berg Stuff
Merge branch 'master' of git://github.com/samgeen/Hamu

Conflicts:
	analysis/ndhistogram/HistoWeighting.pyc
res test