Prettifying cmake files.

Looking into making some pretty substantial changes.