updated makefile [ci skip]
merged bonehead move [ci skip]

Merge branch 'pair_ia' of github.com:poppr/poppr into pair_ia

Conflicts:
	Makefile