small improvements
Merge branch 'master' of https://github.com/KlausVigo/phangorn

Conflicts:
	NAMESPACE