OpenMP disabled by default

Conflicts:
	external/equalizer.tar.gz
Merge branch 'master' of github.com:uic-evl/omegalib into canvas
Merge branch 'canvas' of github.com:uic-evl/omegalib into canvas