added CMakeLists, minor changes in main
Merge pull request #1 from emchristiansen/master

Added CMakeLists.txt, minor changes to main