loads of mpi4py stuff !!
Merge remote-tracking branch 'origin/master'

Conflicts:
	SIFT_distance.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	SIFT_distance.py