Make nvcc optional again
Merge branch 'master' of github.com:espressomd/espresso