Merge branch 'master' into core-updates

Conflicts:
	Makefile.am
	gnu/packages/base.scm

gnu: Add cmake.

* gnu/packages/cmake.scm: New file.
* gnu/packages/patches/cmake-fix-tests.patch: New file.
* Makefile.am: Add them.