CMake tweaking
Merge branch 'master' of github.com:keithroe/Legion

Conflicts:
	src/CMakeLists.txt

Merging with desktop changes.  Compilation fixes for gcc