Feature/openmp

@mikebosse this pulls in your openmp changes.
Is this gcc-specific? What happens on intel compiler? Or on Windows if there is OpenMP support?