Fixed Cmake to build on Crays, did some cleanup