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/openjpeg/package.py

@@ -43,4 +43,4 @@ class Openjpeg(CMakePackage):
     version('1.5.2', '545f98923430369a6b046ef3632ef95c')
     version('1.5.1', 'd774e4b5a0db5f0f171c4fc0aabfa14e')
 
-    depends_on('cmake')
+    depends_on('cmake', type='build')