Fixed tajima'S D ordering
Merge branch 'master' of github.com:smilefreak/selectionTools
Merge branch 'master' of github.com:smilefreak/MerrimanSelectionPipeline into nesi
Fixed obvious bug in script
Minor changes
Multipipeline and standard run.
error in code
Fixed run shapeit
Removed trailing comma causing tuple error when finding genetic map
Update run_pipeline.py

Remove comma
Fixed problem with new shapeit genetic map and file
Merge branch 'master' of github.com:smilefreak/selectionTools
Merge branch 'master' of github.com:smilefreak/selectionTools
Fixed shapeit genetic map format so that haps_interpolate now works with
the genetic map.
Fixed problem with haps_interpolate
made generic
Merge branch 'master', remote branch 'origin' into nesi