finished refactoring Aggregate, new config.catalog
Merge branch 'master' of github.com:hillierdani/visexpA

Conflicts:
	engine/datadisplay/comparer.py
	users/daniel/configuration.py