* Remove makefile implementation
* Add new CMake code (still a WIP)
* Move two headers to new include directory
* Modified a couple of C++ source files to get rid
  of goofy non-existant pragma errors