CUDA and mpi compilation are seperated again
Merge branch 'master' of github.com:espressomd/espresso