Merge remote-tracking branch 'upstream/master'

Conflicts:
	cladecomparelib/core.py
	cladecomparelib/hypg.py
	test/Makefile
Merge branch 'master' of https://github.com/dmcskim/cladecompare