merging
Merge branch 'master' of https://github.com/patrickpowns/corbit
cleaned out makefiles and cmake_install.cmakes
cleaned out makefiles and cmake_install.cmakes