Basic makefile changes.
Removed a bunch of stuff for cmake.  Got makefile working with main based on tutorial help.