changes for phy_megamerge
Merge branch 'master' of github.com:sim82/ivy_mike

Conflicts:
	src/ivymike/large_phylip.h