Added check if a basestring

(rather than a list as expected)
If a string ie 'str' implicitly converts to ['str']

looping though 's','t', 'r' causes failure
resolved conflict
Merge branch 'addtped'

Work done, added test
help..
Merge branch 'master' of https://github.com/hardingnj/anhima

Conflicts:
	src/anhima/h5.py
Merge branch 'typofix'

of https://github.com/hardingnj/anhima
Merge branch 'master' of

https://github.com/alimanfoo/anhima
Adding test
Adding axis = 1, to fix np.take

Bug not handling samples correctly.
New test to catch bug with sample handling
Adding new test h5 file. Converted from test32.vcf

VCF originally from vcflib, uses vcf2np to convert to h5
Update test_h5.py
Merge pull request #72 from hardingnj/samplefix

Samplefix