Merge branch 'develop' into mplegendre-multi_pkgsrc_roots

Conflicts:
	lib/spack/spack/cmd/create.py
	lib/spack/spack/cmd/extensions.py
	lib/spack/spack/cmd/fetch.py
	lib/spack/spack/cmd/uninstall.py
	lib/spack/spack/config.py
	lib/spack/spack/database.py
	lib/spack/spack/directory_layout.py
	lib/spack/spack/packages.py
	lib/spack/spack/spec.py

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

@@ -4,7 +4,7 @@
 
 class Global(Package):
     """ The Gnu Global tagging system """
-    # FIXME: add a proper url for your package's homepage here.
+
     homepage = "http://www.gnu.org/software/global"
     url = "http://tamacom.com/global/global-6.5.tar.gz"
 
@@ -13,9 +13,9 @@ class Global(Package):
     depends_on('exuberant-ctags')
 
     def install(self, spec, prefix):
-        config_args = ['--prefix={}'.format(prefix)]
+        config_args = ['--prefix={0}'.format(prefix)]
 
-        config_args.append('--with-exuberant-ctags={}'.format(
+        config_args.append('--with-exuberant-ctags={0}'.format(
             os.path.join(spec['exuberant-ctags'].prefix.bin, 'ctags')))
 
         configure(*config_args)