Updates to CmakeLists.txt to accommodate lowercase directories
More updates to CmakeLists
Reversion of parts of CmakeLists.txt
Merge branch 'master' of https://github.com/anl-tracc/polaris