Merging changes for tajima's D MAC OSX
Merge branch 'add_beagle' of github.com:smilefreak/selectionTools into add_beagle

Conflicts:
	selection_pipeline/standard_run.py