Small Reorganization
Merge branch 'master' of http://github.com/spartan322/spartanengine
Merge branch 'master' of http://github.com/spartan322/spartanengine
Attempt CMake