Merge branch 'master', remote-tracking branch 'origin/master'

* master:

* origin/master:
  Correct the help string for building a new world.
  Removing long-time obsolete CVS files/directories
  Reduce wanings about unused variables
Clean up CMake stuff; remove profile on OSX.

profile on OSX is deprecated and does not work anymore.
Merge branch 'master' into cmake

* master:
  Merge branch 'master', remote-tracking branch 'origin/master'