Fixed the Nektar++ module so it compiles with Nektar++ 3.3.
removed MacOptiX as it is no longer used by ElVis
Merge remote-tracking branch 'dillon/master' into OptixModelDev

Conflicts:
	src/CMakeLists.txt