Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases

Conflicts:
	lib/spack/spack/__init__.py
	var/spack/repos/builtin/packages/gmp/package.py
	var/spack/repos/builtin/packages/openjpeg/package.py

var/spack/repos/builtin/packages/qhull/package.py

@@ -46,7 +46,7 @@ class Qhull(CMakePackage):
     # https://github.com/qhull/qhull/pull/5
     patch('qhull-iterator.patch', when='@1.0')
     
-    depends_on('cmake')
+    depends_on('cmake', type='build')
 
     @CMakePackage.sanity_check('build')
     @CMakePackage.on_package_attributes(run_tests=True)