Replaced the local FindImageMagick module and associated variables with version included with CMake which correctly handles version numbers in path names.
Merge branch 'master' of https://github.com/embree/embree
Updated CMake variable names for OpenGL and GLUT libraries, added include directories to the CMake includes.