fixed test command
Merge branch 'master' of github.com:ftzeng/argos_cluster
some initial improvements
much better memory performance
Merge branch 'memory_improvements'
re-enabled grid search
Merge branch 'master' into ihac

Conflicts:
	core/cluster.py
created Node and Hierarchy classes