made name and ph a key
Merge branch 'generalising' of https://github.com/C3-CSIRO/Meltdown into generalising

Conflicts:
	meltdown.py
Merge branch 'generalising' of https://github.com/C3-CSIRO/Meltdown into generalising