Merge pull request #120 from eile/master

Cleanup: Move object command enum to its proper header
merge branch master of eyescale
Merge remote-tracking branch 'eile/mpi' into mpi
correct CMake/Collage.cmake
lacked bracket