modified testing_funk
picked Zhian's function modification

Merge branch 'master' of https://github.com/poppr/poppr

Conflicts:
	R/sandbox.r