Deleted a couple of obsolete macro definitions from CMakeLists.txt.
Improved wording in user guide "Installation" page.