dealt with multiple unclassified marker_type
tidy up
added various tests
Merge branch 'master' of https://github.com/mpi2/PhenotypeArchive