[FIX] Fixing mason2 when running without OpenMP.

Also, enabling builds with OpenMP.
[MERGE] Merging rebase.
Merge pull request #41 from holtgrewe/fix/mason2_openmp

Fixing problems with Mason & OpenMP