Adding .orig to .gitignore.
Fixed whitespace in CMakeLists.txt.
Some minor changes to make Doxygen happier
Merged fixes from feat/cmake-refresh. Also got rid of using keyword most places.