Er...
Merge branch 'master' of https://github.com/j3harvey/HelPopGen

Conflicts:
	missingDataStrategiesPar.py