Code formatting
Make sure that cuda compiler doesn't see mpi.h.
Merge branch 'master' of github.com:espressomd/espresso