removed mpi.cfg since we rebuild it everytime
removed .cfg file and merged Lisandro's changes
Merge branch 'master' of github.com:erdc-cm/mpi4py

Conflicts:
	mpi.cfg