Merge branch 'ihac' of github.com:ftzeng/argos_cluster into ihac

Conflicts:
	core/ihacluster.py
	tests.py
Merge branch 'ihac' of github.com:ftzeng/argos_cluster into ihac

Conflicts:
	core/ihacluster.py