ran test through ninja ice
Merge branch 'master' of https://github.com/ptwales/xlmp

Conflicts:
	test_Ixl.py