Add top-level attributes for git M-P packages

104 files changed, 287 insertions, 343 deletions

diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py
index 01422268a1..1acb384f7c 100644
--- a/var/spack/repos/builtin/packages/macsio/package.py
+++ b/var/spack/repos/builtin/packages/macsio/package.py
@@ -26,16 +26,16 @@ from spack import *
 
 
 class Macsio(CMakePackage):
-    """A Multi-purpose, Application-Centric, Scalable I/O Proxy Application
-    """
+    """A Multi-purpose, Application-Centric, Scalable I/O Proxy Application."""
+
     tags = ['proxy-app', 'ecp-proxy-app']
 
     homepage = "http://llnl.github.io/MACSio"
-    url = "https://github.com/LLNL/MACSio/archive/1.0.tar.gz"
+    url      = "https://github.com/LLNL/MACSio/archive/1.0.tar.gz"
+    git      = "https://github.com/LLNL/MACSio.git"
 
+    version('develop', branch='master')
     version('1.0', '90e8e00ea84af2a47bee387ad331dbde')
-    version('develop', git='https://github.com/LLNL/MACSio.git',
-            branch='master')
 
     variant('mpi', default=True, description="Build MPI plugin")
     variant('silo', default=True, description="Build with SILO plugin")
diff --git a/var/spack/repos/builtin/packages/mad-numdiff/package.py b/var/spack/repos/builtin/packages/mad-numdiff/package.py
index 8d687e2258..b4a0235f55 100644
--- a/var/spack/repos/builtin/packages/mad-numdiff/package.py
+++ b/var/spack/repos/builtin/packages/mad-numdiff/package.py
@@ -31,6 +31,7 @@ class MadNumdiff(CMakePackage):
 
     homepage = "https://github.com/quinoacomputing/ndiff"
     url      = "https://github.com/quinoacomputing/ndiff/tarball/20150724"
+    git      = "https://github.com/quinoacomputing/ndiff"
 
-    version('develop', git='https://github.com/quinoacomputing/ndiff', branch='master')
+    version('develop', branch='master')
     version('20150724', '7723c0f2499aea8fd960377c5bed28d8')
diff --git a/var/spack/repos/builtin/packages/mallocmc/package.py b/var/spack/repos/builtin/packages/mallocmc/package.py
index ce8dc2b98e..5ecde73967 100644
--- a/var/spack/repos/builtin/packages/mallocmc/package.py
+++ b/var/spack/repos/builtin/packages/mallocmc/package.py
@@ -39,12 +39,12 @@ class Mallocmc(CMakePackage):
 
     homepage = "https://github.com/ComputationalRadiationPhysics/mallocMC"
     url      = "https://github.com/ComputationalRadiationPhysics/mallocMC/archive/2.2.0crp.tar.gz"
+    git      = "https://github.com/ComputationalRadiationPhysics/mallocMC.git"
+
     maintainers = ['ax3l']
 
-    version('develop', branch='dev',
-            git='https://github.com/ComputationalRadiationPhysics/mallocMC.git')
-    version('master', branch='master',
-            git='https://github.com/ComputationalRadiationPhysics/mallocMC.git')
+    version('develop', branch='dev')
+    version('master', branch='master')
     version('2.2.0crp', '3e5c5fc963d1a9abc829ff701504e54c')
     version('2.1.0crp', 'd2bd2644012b64a246048575e9a9051c')
     version('2.0.1crp', '1f674d5d1ae05446d9a4e4b65465dca0')
diff --git a/var/spack/repos/builtin/packages/masa/package.py b/var/spack/repos/builtin/packages/masa/package.py
index 90df859473..622626d519 100644
--- a/var/spack/repos/builtin/packages/masa/package.py
+++ b/var/spack/repos/builtin/packages/masa/package.py
@@ -31,12 +31,11 @@ class Masa(AutotoolsPackage):
        provides a suite of manufactured solutions for the software
        verification of partial differential equation solvers in multiple
        dimensions."""
+
     homepage = "https://github.com/manufactured-solutions/MASA"
-    url      = "https://github.com/manufactured-solutions/MASA.git"
+    git      = "https://github.com/manufactured-solutions/MASA.git"
 
-    version('master',
-            git='https://github.com/manufactured-solutions/MASA.git',
-            tag='master')
+    version('master', tag='master')
 
     variant('fortran', default=True,
             description='Compile with Fortran interfaces')
diff --git a/var/spack/repos/builtin/packages/mdtest/package.py b/var/spack/repos/builtin/packages/mdtest/package.py
index 2a40e7e638..25068478e5 100644
--- a/var/spack/repos/builtin/packages/mdtest/package.py
+++ b/var/spack/repos/builtin/packages/mdtest/package.py
@@ -31,8 +31,9 @@ class Mdtest(Package):
        and directories and then reports the performance."""
 
     homepage = "https://github.com/LLNL/mdtest"
+    git      = "https://github.com/LLNL/mdtest.git"
 
-    version('1.9.3', git='https://github.com/LLNL/mdtest.git', commit='49f3f0')
+    version('1.9.3', commit='49f3f0')
 
     depends_on('mpi')
 
diff --git a/var/spack/repos/builtin/packages/mefit/package.py b/var/spack/repos/builtin/packages/mefit/package.py
index e82615b732..cbd05eb656 100644
--- a/var/spack/repos/builtin/packages/mefit/package.py
+++ b/var/spack/repos/builtin/packages/mefit/package.py
@@ -31,9 +31,9 @@ class Mefit(Package):
     merge statistics, and filter reads for quality."""
 
     homepage = "https://github.com/nisheth/MeFiT"
-    url      = "https://github.com/nisheth/MeFiT.git"
+    git      = "https://github.com/nisheth/MeFiT.git"
 
-    version('1.0', git='https://github.com/nisheth/MeFiT.git', commit='0733326d8917570bbf70ff5c0f710bf66c13db09')
+    version('1.0', commit='0733326d8917570bbf70ff5c0f710bf66c13db09')
 
     depends_on('py-numpy')
     depends_on('py-htseq')
diff --git a/var/spack/repos/builtin/packages/meraculous/package.py b/var/spack/repos/builtin/packages/meraculous/package.py
index 798de5761c..0fe382d9eb 100644
--- a/var/spack/repos/builtin/packages/meraculous/package.py
+++ b/var/spack/repos/builtin/packages/meraculous/package.py
@@ -31,10 +31,9 @@ class Meraculous(CMakePackage):
 
     homepage = "http://jgi.doe.gov/data-and-tools/meraculous/"
     url      = "https://downloads.sourceforge.net/project/meraculous20/Meraculous-v2.2.4.tar.gz"
+    git      = "https://bitbucket.org/berkeleylab/genomics-meraculous2.git"
 
-    version('2.2.5.1',
-            git="https://bitbucket.org/berkeleylab/genomics-meraculous2.git",
-            branch="release-2.2.5.1")
+    version('2.2.5.1', branch='release-2.2.5.1')
     version('2.2.4', '349feb6cb178643a46e4b092c87bad3a')
 
     depends_on('perl', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py
index d5cbf4f077..832ad61191 100644
--- a/var/spack/repos/builtin/packages/mfem/package.py
+++ b/var/spack/repos/builtin/packages/mfem/package.py
@@ -33,7 +33,7 @@ class Mfem(Package):
     tags = ['FEM', 'finite elements', 'high-order', 'AMR', 'HPC']
 
     homepage = 'http://www.mfem.org'
-    url      = 'https://github.com/mfem/mfem'
+    git      = 'https://github.com/mfem/mfem.git'
 
     maintainers = ['goxberry', 'tzanio', 'markcmiller86', 'acfisher',
                    'v-dobrev']
@@ -62,8 +62,7 @@ class Mfem(Package):
 
     # 'develop' is a special version that is always larger (or newer) than any
     # other version.
-    version('develop',
-            git='https://github.com/mfem/mfem', branch='master')
+    version('develop', branch='master')
 
     version('3.4.0',
             '4e73e4fe0482636de3c5dc983cd395839a83cb16f6f509bd88b053e8b3858e05',
diff --git a/var/spack/repos/builtin/packages/mindthegap/package.py b/var/spack/repos/builtin/packages/mindthegap/package.py
index a9b9fbdf7a..9bc8e5a1a7 100644
--- a/var/spack/repos/builtin/packages/mindthegap/package.py
+++ b/var/spack/repos/builtin/packages/mindthegap/package.py
@@ -31,11 +31,8 @@ class Mindthegap(CMakePackage):
        respect to a reference genome."""
 
     homepage = "https://gatb.inria.fr/software/mind-the-gap/"
-    url      = "https://github.com/GATB/MindTheGap.git"
+    git      = "https://github.com/GATB/MindTheGap.git"
 
-    version('2.0.2',
-            tags='v2.0.2',
-            git='https://github.com/GATB/MindTheGap.git',
-            submodules=True)
+    version('2.0.2', tags='v2.0.2', submodules=True)
 
     depends_on('zlib')
diff --git a/var/spack/repos/builtin/packages/miniaero/package.py b/var/spack/repos/builtin/packages/miniaero/package.py
index bd1422ecf3..cc7ec4e4b2 100644
--- a/var/spack/repos/builtin/packages/miniaero/package.py
+++ b/var/spack/repos/builtin/packages/miniaero/package.py
@@ -32,12 +32,11 @@ class Miniaero(MakefilePackage):
     """
 
     homepage = "http://mantevo.org"
-    url      = "https://github.com/Mantevo/miniAero.git"
+    git      = "https://github.com/Mantevo/miniAero.git"
 
     tags = ['proxy-app']
 
-    version('2016-11-11', git='https://github.com/Mantevo/miniAero.git',
-            commit='f46d135479a5be19ec5d146ccaf0e581aeff4596')
+    version('2016-11-11', commit='f46d135479a5be19ec5d146ccaf0e581aeff4596')
 
     depends_on('kokkos')
 
diff --git a/var/spack/repos/builtin/packages/miniasm/package.py b/var/spack/repos/builtin/packages/miniasm/package.py
index 0de8451fe2..5f6444f741 100644
--- a/var/spack/repos/builtin/packages/miniasm/package.py
+++ b/var/spack/repos/builtin/packages/miniasm/package.py
@@ -30,8 +30,9 @@ class Miniasm(MakefilePackage):
     reads."""
 
     homepage = "http://www.example.co://github.com/lh3/miniasm"
+    git      = "https://github.com/lh3/miniasm.git"
 
-    version('2018-3-30', git='https://github.com/lh3/miniasm.git', commit='55cf0189e2f7d5bda5868396cebe066eec0a9547')
+    version('2018-3-30', commit='55cf0189e2f7d5bda5868396cebe066eec0a9547')
 
     depends_on('zlib')
 
diff --git a/var/spack/repos/builtin/packages/mitos/package.py b/var/spack/repos/builtin/packages/mitos/package.py
index 40f4fe7014..4c998f5541 100644
--- a/var/spack/repos/builtin/packages/mitos/package.py
+++ b/var/spack/repos/builtin/packages/mitos/package.py
@@ -31,10 +31,9 @@ class Mitos(CMakePackage):
 
     homepage = "https://github.com/llnl/Mitos"
     url      = "https://github.com/LLNL/Mitos/archive/v0.9.1.tar.gz"
+    git      = "https://github.com/llnl/Mitos.git"
 
-    version('0.9.2',
-            git='https://github.com/llnl/Mitos.git',
-            commit='8cb143a2e8c00353ff531a781a9ca0992b0aaa3d')
+    version('0.9.2', commit='8cb143a2e8c00353ff531a781a9ca0992b0aaa3d')
     version('0.9.1', 'c6cb57f3cae54f5157affd97ef7ef79e')
 
     depends_on('dyninst@8.2.1:')
diff --git a/var/spack/repos/builtin/packages/mlhka/package.py b/var/spack/repos/builtin/packages/mlhka/package.py
index dd2e044a23..9d76b3df79 100644
--- a/var/spack/repos/builtin/packages/mlhka/package.py
+++ b/var/spack/repos/builtin/packages/mlhka/package.py
@@ -30,10 +30,9 @@ class Mlhka(Package):
        and divergence data."""
 
     homepage = "https://wright.eeb.utoronto.ca"
-    url      = "https://github.com/rossibarra/MLHKA"
+    git      = "https://github.com/rossibarra/MLHKA.git"
 
-    version('2.1', git='https://github.com/rossibarra/MLHKA.git',
-            commit='e735ddd39073af58da21b00b27dea203736e5467')
+    version('2.1', commit='e735ddd39073af58da21b00b27dea203736e5467')
 
     def install(self, spec, prefix):
         cxx = which('c++')
diff --git a/var/spack/repos/builtin/packages/mofem-cephas/package.py b/var/spack/repos/builtin/packages/mofem-cephas/package.py
index f98f0a6379..01b2d36fb9 100644
--- a/var/spack/repos/builtin/packages/mofem-cephas/package.py
+++ b/var/spack/repos/builtin/packages/mofem-cephas/package.py
@@ -27,15 +27,12 @@ class MofemCephas(CMakePackage):
     """mofem-cephas core library"""
 
     homepage = "http://mofem.eng.gla.ac.uk"
-    url = "https://bitbucket.org/likask/mofem-cephas.git"
+    git      = "https://bitbucket.org/likask/mofem-cephas.git"
 
     maintainers = ['likask']
 
-    version('0.8.7', git='https://bitbucket.org/likask/mofem-cephas.git',
-        tag='v0.8.7', submodules=True)
-    version('develop',
-        git='https://bitbucket.org/likask/mofem-cephas.git',
-        branch='develop', submodules=True)
+    version('develop', branch='develop', submodules=True)
+    version('0.8.7', tag='v0.8.7', submodules=True)
 
     # This option can be only used for development of core lib
     variant('copy_user_modules', default=True,
diff --git a/var/spack/repos/builtin/packages/mofem-fracture-module/package.py b/var/spack/repos/builtin/packages/mofem-fracture-module/package.py
index 0369aba7d2..fde8de5b94 100644
--- a/var/spack/repos/builtin/packages/mofem-fracture-module/package.py
+++ b/var/spack/repos/builtin/packages/mofem-fracture-module/package.py
@@ -27,16 +27,12 @@ class MofemFractureModule(CMakePackage):
     """mofem fracture module"""
 
     homepage = "http://mofem.eng.gla.ac.uk"
-    url = "https://bitbucket.org/likask/mofem_um_fracture_mechanics"
+    git = "https://bitbucket.org/likask/mofem_um_fracture_mechanics.git"
 
     maintainers = ['likask']
 
-    version('0.9.42',
-        git='https://bitbucket.org/likask/mofem_um_fracture_mechanics',
-        tag='v0.9.42')
-    version('develop',
-        git='https://bitbucket.org/likask/mofem_um_fracture_mechanics',
-        branch='develop')
+    version('develop', branch='develop')
+    version('0.9.42', tag='v0.9.42')
 
     variant('copy_user_modules', default=True,
         description='Copy user modules directory instead linking')
diff --git a/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py b/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py
index 761fbc178a..7a7457d61c 100644
--- a/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py
+++ b/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py
@@ -27,16 +27,12 @@ class MofemMinimalSurfaceEquation(CMakePackage):
     """mofem minimal surface equation"""
 
     homepage = "http://mofem.eng.gla.ac.uk"
-    url = "https://bitbucket.org/likask/mofem_um_minimal_surface_equation"
+    git      = "https://bitbucket.org/likask/mofem_um_minimal_surface_equation.git"
 
     maintainers = ['likask']
 
-    version('0.3.9',
-        git='https://bitbucket.org/likask/mofem_um_minimal_surface_equation',
-        tag='v0.3.9')
-    version('develop',
-        git='https://bitbucket.org/likask/mofem_um_minimal_surface_equation',
-        branch='develop')
+    version('develop', branch='develop')
+    version('0.3.9', tag='v0.3.9')
 
     variant('copy_user_modules', default=True,
         description='Copy user modules directory instead linking')
diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py
index 9398df42bb..62fb44de29 100644
--- a/var/spack/repos/builtin/packages/mpich/package.py
+++ b/var/spack/repos/builtin/packages/mpich/package.py
@@ -31,10 +31,12 @@ class Mpich(AutotoolsPackage):
     the Message Passing Interface (MPI) standard."""
 
     homepage = "http://www.mpich.org"
-    url = "http://www.mpich.org/static/downloads/3.0.4/mpich-3.0.4.tar.gz"
+    url      = "http://www.mpich.org/static/downloads/3.0.4/mpich-3.0.4.tar.gz"
+    git      = "https://github.com/pmodels/mpich.git"
     list_url = "http://www.mpich.org/static/downloads/"
     list_depth = 1
 
+    version('develop', submodules=True)
     version('3.2.1', 'e175452f4d61646a52c73031683fc375')
     version('3.2',   'f414cfa77099cd1fa1a5ae4e22db508a')
     version('3.1.4', '2ab544607986486562e076b83937bba2')
@@ -43,7 +45,6 @@ class Mpich(AutotoolsPackage):
     version('3.1.1', '40dc408b1e03cc36d80209baaa2d32b7')
     version('3.1',   '5643dd176499bfb7d25079aaff25f2ec')
     version('3.0.4', '9c5d5d4fe1e17dd12153f40bc5b6dbc0')
-    version('develop', git='git://github.com/pmodels/mpich', submodules=True)
 
     variant('hydra', default=True,  description='Build the hydra process manager')
     variant('pmi',   default=True,  description='Build with PMI support')
diff --git a/var/spack/repos/builtin/packages/mpifileutils/package.py b/var/spack/repos/builtin/packages/mpifileutils/package.py
index b59e34768e..32ec11a0ed 100644
--- a/var/spack/repos/builtin/packages/mpifileutils/package.py
+++ b/var/spack/repos/builtin/packages/mpifileutils/package.py
@@ -37,8 +37,9 @@ class Mpifileutils(AutotoolsPackage):
 
     homepage = "https://github.com/hpc/mpifileutils"
     url      = "https://github.com/hpc/mpifileutils/releases/download/v0.6/mpifileutils-0.6.tar.gz"
+    git      = "https://github.com/hpc/mpifileutils.git"
 
-    version('develop', git='https://github.com/hpc/mpifileutils.git')
+    version('develop', git=git)
     version('0.7', 'c081f7f72c4521dddccdcf9e087c5a2b')
     version('0.6', '620bcc4966907481f1b1a965b28fc9bf')
 
diff --git a/var/spack/repos/builtin/packages/mpilander/package.py b/var/spack/repos/builtin/packages/mpilander/package.py
index 9be27b90a9..b0dbee3ea9 100644
--- a/var/spack/repos/builtin/packages/mpilander/package.py
+++ b/var/spack/repos/builtin/packages/mpilander/package.py
@@ -29,11 +29,11 @@ class Mpilander(CMakePackage):
     """There can only be one (MPI process)!"""
 
     homepage = "https://github.com/MPILander/MPILander"
-    url      = "https://github.com/MPILander/MPILander/archive/0.1.0.tar.gz"
+    git      = "https://github.com/MPILander/MPILander.git"
+
     maintainers = ['ax3l']
 
-    version('develop', branch='master',
-            git='https://github.com/MPILander/MPILander.git')
+    version('develop', branch='master')
 
     # variant('cuda', default=False, description='Enable CUDA support')
     # variant(
diff --git a/var/spack/repos/builtin/packages/mpir/package.py b/var/spack/repos/builtin/packages/mpir/package.py
index a196919546..4f26bfe45b 100644
--- a/var/spack/repos/builtin/packages/mpir/package.py
+++ b/var/spack/repos/builtin/packages/mpir/package.py
@@ -30,10 +30,11 @@ class Mpir(Package):
 
     homepage = "https://github.com/wbhart/mpir"
     url      = "https://github.com/wbhart/mpir/archive/mpir-2.7.0.tar.gz"
+    git      = "https://github.com/wbhart/mpir.git"
 
+    version('develop', git=git)
     version('2.7.0', '985b5d57bd0e74c74125ee885b9c8f71')
     version('2.6.0', 'ec17d6a7e026114ceb734b2466aa0a91')
-    version('develop', git='https://github.com/wbhart/mpir.git')
 
     # This setting allows mpir to act as a drop-in replacement for gmp
     variant('gmp_compat',        default=False,
diff --git a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py
index d5d8190621..f72b0fff4f 100644
--- a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py
+++ b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py
@@ -32,10 +32,9 @@ class MpixLaunchSwift(Package):
     """
 
     homepage = "https://bitbucket.org/kshitijvmehta/mpix_launch_swift"
-    url = "https://kshitijvmehta@bitbucket.org/kshitijvmehta/mpix_launch_swift.git"
+    git      = "https://kshitijvmehta@bitbucket.org/kshitijvmehta/mpix_launch_swift.git"
 
-    version('develop', git='https://kshitijvmehta@bitbucket.org/kshitijvmehta/mpix_launch_swift.git',
-            branch='envs')
+    version('develop', branch='envs')
 
     depends_on('stc')
     depends_on('tcl')
diff --git a/var/spack/repos/builtin/packages/mrbayes/package.py b/var/spack/repos/builtin/packages/mrbayes/package.py
index fcc29329bd..69fb15de5d 100644
--- a/var/spack/repos/builtin/packages/mrbayes/package.py
+++ b/var/spack/repos/builtin/packages/mrbayes/package.py
@@ -32,10 +32,9 @@ class Mrbayes(AutotoolsPackage):
        of model parameters."""
 
     homepage = "http://mrbayes.sourceforge.net"
-    url      = "https://github.com/NBISweden/MrBayes"
+    git      = "https://github.com/NBISweden/MrBayes.git"
 
-    version('2017-11-22', commit='8a9adb11bcc538cb95d91d57568dff383f924503',
-            git='https://github.com/NBISweden/MrBayes.git')
+    version('2017-11-22', commit='8a9adb11bcc538cb95d91d57568dff383f924503')
 
     variant('mpi', default=True, description='Enable MPI parallel support')
     variant('beagle', default=True, description='Enable BEAGLE library for speed benefits')
diff --git a/var/spack/repos/builtin/packages/mrnet/package.py b/var/spack/repos/builtin/packages/mrnet/package.py
index 996ce273d0..dc7ca9acf9 100644
--- a/var/spack/repos/builtin/packages/mrnet/package.py
+++ b/var/spack/repos/builtin/packages/mrnet/package.py
@@ -27,13 +27,14 @@ from spack import *
 
 class Mrnet(AutotoolsPackage):
     """The MRNet Multi-Cast Reduction Network."""
+
     homepage = "http://paradyn.org/mrnet"
     url      = "http://ftp.cs.wisc.edu/pub/paradyn/mrnet/mrnet_5.0.1.tar.gz"
+    git      = "https://github.com/dyninst/mrnet.git"
     list_url = "http://ftp.cs.wisc.edu/paradyn/mrnet"
 
-    version('5.0.1-3', git='https://github.com/dyninst/mrnet.git')
-    version('5.0.1-2', git='https://github.com/dyninst/mrnet.git',
-            commit='20b1eacfc6d680d9f6472146d2dfaa0f900cc2e9')
+    version('5.0.1-3', git=git)
+    version('5.0.1-2', commit='20b1eacfc6d680d9f6472146d2dfaa0f900cc2e9')
     version('5.0.1', '17f65738cf1b9f9b95647ff85f69ecdd')
     version('4.1.0', '5a248298b395b329e2371bf25366115c')
     version('4.0.0', 'd00301c078cba57ef68613be32ceea2f')
diff --git a/var/spack/repos/builtin/packages/mrtrix3/package.py b/var/spack/repos/builtin/packages/mrtrix3/package.py
index 1d9d089333..a61a19cc4c 100644
--- a/var/spack/repos/builtin/packages/mrtrix3/package.py
+++ b/var/spack/repos/builtin/packages/mrtrix3/package.py
@@ -33,10 +33,9 @@ class Mrtrix3(Package):
        density."""
 
     homepage = "http://www.mrtrix.org/"
-    url      = "https://github.com/MRtrix3/mrtrix3"
+    git      = "https://github.com/MRtrix3/mrtrix3.git"
 
-    version('2017-09-25', commit='72aca89e3d38c9d9e0c47104d0fb5bd2cbdb536d',
-            git='https://github.com/MRtrix3/mrtrix3.git')
+    version('2017-09-25', commit='72aca89e3d38c9d9e0c47104d0fb5bd2cbdb536d')
 
     depends_on('python@2.7:', type=('build', 'run'))
     depends_on('py-numpy', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/mshadow/package.py b/var/spack/repos/builtin/packages/mshadow/package.py
index 83b9eee2d4..a8bc977303 100644
--- a/var/spack/repos/builtin/packages/mshadow/package.py
+++ b/var/spack/repos/builtin/packages/mshadow/package.py
@@ -30,11 +30,10 @@ class Mshadow(Package):
     in C++/CUDA."""
 
     homepage = "https://github.com/dmlc/mshadow"
-    url      = "https://github.com/dmlc/mshadow/archive/v1.1.tar.gz"
+    git      = "https://github.com/dmlc/mshadow.git"
 
-    version('master', git='https://github.com/dmlc/mshadow.git', branch='master')
-    version('20170721', git='https://github.com/dmlc/mshadow.git',
-            commit='20b54f068c1035f0319fa5e5bbfb129c450a5256')
+    version('master', branch='master')
+    version('20170721', commit='20b54f068c1035f0319fa5e5bbfb129c450a5256')
 
     def install(self, spec, prefix):
         install_tree('mshadow', prefix.include.mshadow)
diff --git a/var/spack/repos/builtin/packages/multiverso/package.py b/var/spack/repos/builtin/packages/multiverso/package.py
index 2d7e48cf47..ed803a4be8 100644
--- a/var/spack/repos/builtin/packages/multiverso/package.py
+++ b/var/spack/repos/builtin/packages/multiverso/package.py
@@ -31,11 +31,10 @@ class Multiverso(CMakePackage):
 
     homepage = "https://github.com/Microsoft/Multiverso"
     url      = "https://github.com/Microsoft/Multiverso/archive/v0.2.tar.gz"
+    git      = "https://github.com/Microsoft/Multiverso.git"
 
-    version('master', git='https://github.com/Microsoft/Multiverso.git',
-            branch='master')
-    version('143187', git='https://github.com/Microsoft/Multiverso.git',
-            commit='143187575d1cfa410100037b8aea2e767e0af637')
+    version('master', branch='master')
+    version('143187', commit='143187575d1cfa410100037b8aea2e767e0af637')
     version('0.2', '483ca7524fea14a311389e421f2bc098')
 
     depends_on('mpi')
diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py
index 87b235bc0b..8ea04adf92 100644
--- a/var/spack/repos/builtin/packages/nalu-wind/package.py
+++ b/var/spack/repos/builtin/packages/nalu-wind/package.py
@@ -28,10 +28,12 @@ class NaluWind(CMakePackage):
     """Nalu-Wind: Wind energy focused variant of Nalu."""
 
     homepage = "https://github.com/exawind/nalu-wind"
-    url      = "https://github.com/exawind/nalu-wind.git"
+    git      = "https://github.com/exawind/nalu-wind.git"
 
     maintainers = ['jrood-nrel']
 
+    version('master', branch='master')
+
     variant('openfast', default=False,
             description='Compile with OpenFAST support')
     variant('tioga', default=False,
@@ -39,9 +41,6 @@ class NaluWind(CMakePackage):
     variant('hypre', default=False,
             description='Compile with Hypre support')
 
-    version('master',
-            git='https://github.com/exawind/nalu-wind.git', branch='master')
-
     depends_on('mpi')
     depends_on('yaml-cpp@0.5.3:')
     depends_on('trilinos+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards~hypre@master,develop')
diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py
index 44efe0121e..89084f51d3 100644
--- a/var/spack/repos/builtin/packages/nalu/package.py
+++ b/var/spack/repos/builtin/packages/nalu/package.py
@@ -32,10 +32,12 @@ class Nalu(CMakePackage):
     """
 
     homepage = "https://github.com/NaluCFD/Nalu"
-    url      = "https://github.com/NaluCFD/Nalu.git"
+    git      = "https://github.com/NaluCFD/Nalu.git"
 
     tags = ['ecp', 'ecp-apps']
 
+    version('master', branch='master')
+
     variant('openfast', default=False,
             description='Compile with OpenFAST support')
     variant('tioga', default=False,
@@ -43,9 +45,6 @@ class Nalu(CMakePackage):
     variant('hypre', default=False,
             description='Compile with Hypre support')
 
-    version('master',
-            git='https://github.com/NaluCFD/Nalu.git', branch='master')
-
     depends_on('mpi')
     depends_on('yaml-cpp@0.5.3:')
     depends_on('trilinos+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards~hypre@master,develop')
diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py
index 291cc348e0..34ee6cdb63 100644
--- a/var/spack/repos/builtin/packages/nek5000/package.py
+++ b/var/spack/repos/builtin/packages/nek5000/package.py
@@ -42,16 +42,14 @@ class Nek5000(Package):
        dynamics"""
 
     homepage = "https://nek5000.mcs.anl.gov/"
-    url      = "https://github.com/Nek5000/Nek5000"
+    url      = "https://github.com/Nek5000/Nek5000/releases/download/v17.0/Nek5000-v17.0.tar.gz"
+    git      = "https://github.com/Nek5000/Nek5000.git"
 
     tags = ['cfd', 'flow', 'hpc', 'solver', 'navier-stokes',
             'spectral-elements', 'fluid', 'ecp', 'ecp-apps']
 
-    version('17.0', '6a13bfad2ce023897010dd88f54a0a87',
-            url="https://github.com/Nek5000/Nek5000/releases/download/"
-                    "v17.0/Nek5000-v17.0.tar.gz")
-    version('develop', git='https://github.com/Nek5000/Nek5000.git',
-        branch='master')
+    version('develop', branch='master')
+    version('17.0', '6a13bfad2ce023897010dd88f54a0a87')
 
     # MPI, Profiling and Visit variants
     variant('mpi',       default=True, description='Build with MPI.')
diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py
index aae60ef797..f610c9e416 100644
--- a/var/spack/repos/builtin/packages/nekbone/package.py
+++ b/var/spack/repos/builtin/packages/nekbone/package.py
@@ -32,12 +32,13 @@ class Nekbone(Package):
        the spectral element method."""
 
     homepage = "https://github.com/Nek5000/Nekbone"
-    url = "https://github.com/Nek5000/Nekbone/archive/v17.0.tar.gz"
+    url      = "https://github.com/Nek5000/Nekbone/archive/v17.0.tar.gz"
+    git      = "https://github.com/Nek5000/Nekbone.git"
 
     tags = ['proxy-app', 'ecp-proxy-app']
 
+    version('develop', git=git)
     version('17.0', sha256='ae361cc61368a924398a28a296f675b7f0c4a9516788a7f8fa3c09d787cdf69b')
-    version('develop', git='https://github.com/Nek5000/Nekbone.git')
 
     # Variants
     variant('mpi', default=True, description='Build with MPI')
diff --git a/var/spack/repos/builtin/packages/nekcem/package.py b/var/spack/repos/builtin/packages/nekcem/package.py
index aa460d7445..6aedcdf9fd 100644
--- a/var/spack/repos/builtin/packages/nekcem/package.py
+++ b/var/spack/repos/builtin/packages/nekcem/package.py
@@ -33,15 +33,14 @@ class Nekcem(Package):
 
     # Links to homepage and git
     homepage = "https://nekcem.mcs.anl.gov"
-    url      = "https://github.com/NekCEM/NekCEM/archive/development.zip"
+    git      = "https://github.com/NekCEM/NekCEM.git"
 
     # Variants
     variant('mpi', default=True, description='Build with MPI')
 
     # We only have a development version
-    version('develop', git='https://github.com/NekCEM/NekCEM.git')
-    version('0b8bedd', git='https://github.com/NekCEM/NekCEM.git',
-            commit='0b8beddfdcca646bfcc866dfda1c5f893338399b')
+    version('develop')
+    version('0b8bedd', commit='0b8beddfdcca646bfcc866dfda1c5f893338399b')
 
     # dependencies
     depends_on('mpi', when='+mpi')
diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py
index df1b45d2ed..b84ec2db34 100644
--- a/var/spack/repos/builtin/packages/neuron/package.py
+++ b/var/spack/repos/builtin/packages/neuron/package.py
@@ -38,13 +38,13 @@ class Neuron(Package):
 
     homepage = "https://www.neuron.yale.edu/"
     url      = "http://www.neuron.yale.edu/ftp/neuron/versions/v7.5/nrn-7.5.tar.gz"
-    github   = "https://github.com/nrnhines/nrn"
+    git      = "https://github.com/nrnhines/nrn.git"
 
+    version('develop', git=git)
     version('7.5', 'fb72c841374dfacbb6c2168ff57bfae9')
     version('7.4', '2c0bbee8a9e55d60fa26336f4ab7acbf')
     version('7.3', '993e539cb8bf102ca52e9fefd644ab61')
     version('7.2', '5486709b6366add932e3a6d141c4f7ad')
-    version('develop', git=github)
 
     variant('mpi',           default=True,  description='Enable MPI parallelism')
     variant('python',        default=True,  description='Enable python')
diff --git a/var/spack/repos/builtin/packages/nlopt/package.py b/var/spack/repos/builtin/packages/nlopt/package.py
index 9ff1f0ee38..1b5a904132 100644
--- a/var/spack/repos/builtin/packages/nlopt/package.py
+++ b/var/spack/repos/builtin/packages/nlopt/package.py
@@ -33,8 +33,9 @@ class Nlopt(CMakePackage):
 
     homepage = "https://nlopt.readthedocs.io"
     url      = "https://github.com/stevengj/nlopt/releases/download/nlopt-2.4.2/nlopt-2.4.2.tar.gz"
+    git      = "https://github.com/stevengj/nlopt.git"
 
-    version('develop', git='https://github.com/stevengj/nlopt.git', branch='master')
+    version('develop', branch='master')
     version('2.4.2', 'd0b8f139a4acf29b76dbae69ade8ac54')
 
     variant('shared', default=True, description='Enables the build of shared libraries')
diff --git a/var/spack/repos/builtin/packages/nnvm/package.py b/var/spack/repos/builtin/packages/nnvm/package.py
index c3caf69cf1..b520b014e8 100644
--- a/var/spack/repos/builtin/packages/nnvm/package.py
+++ b/var/spack/repos/builtin/packages/nnvm/package.py
@@ -30,11 +30,10 @@ class Nnvm(CMakePackage):
     part to help build deep learning libraries."""
 
     homepage = "https://github.com/dmlc/nnvm"
-    url      = "https://github.com/dmlc/nnvm.git"
+    git      = "https://github.com/dmlc/nnvm.git"
 
-    version('master', git='https://github.com/dmlc/nnvm.git', branch='master')
-    version('20170418', git='https://github.com/dmlc/nnvm.git',
-            commit='b279286304ac954098d94a2695bca599e832effb')
+    version('master', branch='master')
+    version('20170418', commit='b279286304ac954098d94a2695bca599e832effb')
 
     variant('shared', default=True, description='Build a shared NNVM lib.')
 
diff --git a/var/spack/repos/builtin/packages/nut/package.py b/var/spack/repos/builtin/packages/nut/package.py
index a5f0c427d6..c53cb188ab 100644
--- a/var/spack/repos/builtin/packages/nut/package.py
+++ b/var/spack/repos/builtin/packages/nut/package.py
@@ -32,15 +32,12 @@ class Nut(CMakePackage):
     and performance issues."""
 
     homepage = "https://github.com/lanl/NuT"
-    url      = "https://github.com/lanl/NuT.git"
-    tags     = ['proxy-app']
+    git      = "https://github.com/lanl/NuT.git"
 
-    version(
-        'serial', git='https://github.com/lanl/NuT.git',
-        branch='master')
-    version(
-        'openmp', git='https://github.com/lanl/NuT.git',
-        branch='openmp')
+    tags = ['proxy-app']
+
+    version('serial', branch='master')
+    version('openmp', branch='openmp')
 
     depends_on('cmake@3.0:')
     depends_on('random123')
diff --git a/var/spack/repos/builtin/packages/occa/package.py b/var/spack/repos/builtin/packages/occa/package.py
index df00f80e6f..a27d3c6b34 100644
--- a/var/spack/repos/builtin/packages/occa/package.py
+++ b/var/spack/repos/builtin/packages/occa/package.py
@@ -38,13 +38,12 @@ class Occa(Package):
     """
 
     homepage = "http://libocca.org"
-    url      = 'https://github.com/libocca/occa'
-    git_url  = 'https://github.com/libocca/occa.git'
+    git      = 'https://github.com/libocca/occa.git'
 
-    version('develop', git='https://github.com/libocca/occa.git')
-    version('v1.0.0-alpha.5', git=git_url, tag='v1.0.0-alpha.5')
-    version('v0.2.0', git=git_url, tag='v0.2.0')
-    version('v0.1.0', git=git_url, tag='v0.1.0')
+    version('develop')
+    version('v1.0.0-alpha.5', tag='v1.0.0-alpha.5')
+    version('v0.2.0', tag='v0.2.0')
+    version('v0.1.0', tag='v0.1.0')
 
     variant('cuda',
             default=True,
diff --git a/var/spack/repos/builtin/packages/of-adios-write/package.py b/var/spack/repos/builtin/packages/of-adios-write/package.py
index 0c56f0286c..ba2be2f601 100644
--- a/var/spack/repos/builtin/packages/of-adios-write/package.py
+++ b/var/spack/repos/builtin/packages/of-adios-write/package.py
@@ -56,11 +56,11 @@ class OfAdiosWrite(Package):
     # Currently only via git, but with some branches corresponding to main
     # OpenFOAM releases.
     homepage = "https://develop.openfoam.com/Community/feature-adiosWrite/"
-    gitrepo  = "https://develop.openfoam.com/Community/feature-adiosWrite.git"
+    git      = "https://develop.openfoam.com/Community/feature-adiosWrite.git"
 
-    version('develop', branch='develop', git=gitrepo)
-    version('1706', branch='v1706', git=gitrepo)
-    version('1612', branch='v1612', git=gitrepo)
+    version('develop', branch='develop')
+    version('1706', branch='v1706')
+    version('1612', branch='v1612')
 
     variant('source', default=True, description='Install library source')
 
diff --git a/var/spack/repos/builtin/packages/of-precice/package.py b/var/spack/repos/builtin/packages/of-precice/package.py
index 2b3f64aaea..88180f6c57 100644
--- a/var/spack/repos/builtin/packages/of-precice/package.py
+++ b/var/spack/repos/builtin/packages/of-precice/package.py
@@ -33,10 +33,10 @@ class OfPrecice(Package):
     """preCICE adapter for OpenFOAM"""
 
     homepage = 'https://www.precice.org'
-    gitrepo  = 'https://github.com/precice/openfoam-adapter.git'
+    git      = 'https://github.com/precice/openfoam-adapter.git'
 
     # Currently develop only
-    version('develop', branch='master', git=gitrepo)
+    version('develop', branch='master')
 
     depends_on('openfoam+source')
     depends_on('precice')
diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py
index d70e86dd3b..ed5301cb03 100644
--- a/var/spack/repos/builtin/packages/openblas/package.py
+++ b/var/spack/repos/builtin/packages/openblas/package.py
@@ -31,9 +31,12 @@ import spack.architecture
 
 class Openblas(MakefilePackage):
     """OpenBLAS: An optimized BLAS library"""
+
     homepage = 'http://www.openblas.net'
-    url = 'http://github.com/xianyi/OpenBLAS/archive/v0.2.19.tar.gz'
+    url      = 'http://github.com/xianyi/OpenBLAS/archive/v0.2.19.tar.gz'
+    git      = 'https://github.com/xianyi/OpenBLAS.git'
 
+    version('develop', branch='develop')
     version('0.3.0',  '42cde2c1059a8a12227f1e6551c8dbd2')
     version('0.2.20', '48637eb29f5b492b91459175dcc574b1')
     version('0.2.19', '28c998054fd377279741c6f0b9ea7941')
@@ -41,8 +44,6 @@ class Openblas(MakefilePackage):
     version('0.2.17', '664a12807f2a2a7cda4781e3ab2ae0e1')
     version('0.2.16', 'fef46ab92463bdbb1479dcec594ef6dc')
     version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9')
-    version('develop', git='https://github.com/xianyi/OpenBLAS.git',
-            branch='develop')
 
     variant(
         'shared',
diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py
index ecc92d7848..6ade9fcba5 100644
--- a/var/spack/repos/builtin/packages/openfast/package.py
+++ b/var/spack/repos/builtin/packages/openfast/package.py
@@ -29,16 +29,12 @@ class Openfast(CMakePackage):
     """Wind turbine simulation package from NREL"""
 
     homepage = "http://openfast.readthedocs.io/en/latest/"
-    url      = "https://github.com/OpenFAST/openfast.git"
+    git      = "https://github.com/OpenFAST/openfast.git"
 
     maintainers = ['jrood-nrel']
 
-    version('develop',
-            git='https://github.com/OpenFAST/openfast.git',
-            branch='dev')
-    version('master',
-            git='https://github.com/OpenFAST/openfast.git',
-            branch='master')
+    version('develop', branch='dev')
+    version('master', branch='master')
 
     variant('shared', default=False,
             description="Build shared libraries")
diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py
index 26c763d7e3..b86398d230 100644
--- a/var/spack/repos/builtin/packages/openfoam-com/package.py
+++ b/var/spack/repos/builtin/packages/openfoam-com/package.py
@@ -276,16 +276,16 @@ class OpenfoamCom(Package):
 
     maintainers = ['olesenm']
     homepage = "http://www.openfoam.com/"
-    gitrepo  = "https://develop.openfoam.com/Development/OpenFOAM-plus.git"
     url      = "https://sourceforge.net/projects/openfoamplus/files/v1706/OpenFOAM-v1706.tgz"
+    git      = "https://develop.openfoam.com/Development/OpenFOAM-plus.git"
     list_url = "https://sourceforge.net/projects/openfoamplus/files/"
     list_depth = 2
 
+    version('develop', branch='develop', submodules='True')  # Needs credentials
     version('1806', 'bb244a3bde7048a03edfccffc46c763f')
     version('1712', '6ad92df051f4d52c7d0ec34f4b8eb3bc')
     version('1706', '630d30770f7b54d6809efbf94b7d7c8f')
     version('1612', 'ca02c491369150ab127cbb88ec60fbdf')
-    version('develop', branch='develop', git=gitrepo, submodules='True')  # Needs credentials
 
     variant('float32', default=False,
             description='Use single-precision')
diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py
index 17ea54e0c2..74c7cac236 100644
--- a/var/spack/repos/builtin/packages/openfoam-org/package.py
+++ b/var/spack/repos/builtin/packages/openfoam-org/package.py
@@ -80,14 +80,15 @@ class OpenfoamOrg(Package):
     homepage = "http://www.openfoam.org/"
     baseurl  = "https://github.com/OpenFOAM"
     url      = "https://github.com/OpenFOAM/OpenFOAM-4.x/archive/version-4.1.tar.gz"
+    git      = "https://github.com/OpenFOAM/OpenFOAM-dev.git"
 
+    version('develop', git=git)
     version('5.0', 'cd8c5bdd3ff39c34f61747c8e55f59d1',
             url=baseurl + '/OpenFOAM-5.x/archive/version-5.0.tar.gz')
     version('4.1', 'afd7d8e66e7db0ffaf519b14f1a8e1d4',
             url=baseurl + '/OpenFOAM-4.x/archive/version-4.1.tar.gz')
     version('2.4.0', 'ad7d8b7b0753655b2b6fd9e92eefa92a',
             url=baseurl + '/OpenFOAM-2.4.x/archive/version-2.4.0.tar.gz')
-    version('develop', git='https://github.com/OpenFOAM/OpenFOAM-dev.git')
 
     variant('int64', default=False,
             description='Compile with 64-bit label')
diff --git a/var/spack/repos/builtin/packages/openmc/package.py b/var/spack/repos/builtin/packages/openmc/package.py
index 97c819c433..9667c80cdd 100644
--- a/var/spack/repos/builtin/packages/openmc/package.py
+++ b/var/spack/repos/builtin/packages/openmc/package.py
@@ -34,11 +34,11 @@ class Openmc(MakefilePackage):
        Group at MIT."""
 
     homepage = "https://github.com/ANL-CESAR/"
-    url = "https://github.com/ANL-CESAR/openmc.git"
+    git      = "https://github.com/ANL-CESAR/openmc.git"
 
     tags = ['ecp', 'ecp-apps']
 
-    version('develop', git='https://github.com/ANL-CESAR/openmc.git')
+    version('develop')
 
     build_directory = 'src'
 
diff --git a/var/spack/repos/builtin/packages/opennurbs/package.py b/var/spack/repos/builtin/packages/opennurbs/package.py
index 43135b7a31..6603f46af3 100644
--- a/var/spack/repos/builtin/packages/opennurbs/package.py
+++ b/var/spack/repos/builtin/packages/opennurbs/package.py
@@ -32,13 +32,11 @@ class Opennurbs(Package):
     """
 
     homepage = "https://github.com/OpenNURBS/OpenNURBS"
-    url      = "https://github.com/OpenNURBS/OpenNURBS.git"
+    git      = "https://github.com/OpenNURBS/OpenNURBS.git"
 
     maintainers = ['jrood-nrel']
 
-    version('develop',
-            git='https://github.com/OpenNURBS/OpenNURBS.git',
-            branch='develop')
+    version('develop', branch='develop')
 
     version('percept', '59163fd085a24c7a4c2170c70bb60fea',
             url='https://github.com/PerceptTools/percept/raw/master/build-cmake/opennurbs-percept.tar.gz')
diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py
index d2d032a3e7..420465d1d1 100644
--- a/var/spack/repos/builtin/packages/openpmd-api/package.py
+++ b/var/spack/repos/builtin/packages/openpmd-api/package.py
@@ -29,11 +29,11 @@ class OpenpmdApi(CMakePackage):
     """API for easy reading and writing of openPMD files"""
 
     homepage = "http://www.openPMD.org"
-    url      = "https://github.com/openPMD/openPMD-api/archive/1.0.0.tar.gz"
+    git      = "https://github.com/openPMD/openPMD-api.git"
+
     maintainers = ['ax3l']
 
-    version('develop', branch='dev',
-            git='https://github.com/openPMD/openPMD-api.git')
+    version('develop', branch='dev')
 
     variant('mpi', default=True,
             description='Enable parallel I/O')
diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py
index feea4121bf..ef1be9dbfd 100644
--- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py
@@ -69,17 +69,11 @@ class OpenspeedshopUtils(CMakePackage):
     """
 
     homepage = "http://www.openspeedshop.org"
-    url = "https://github.com/OpenSpeedShop/openspeedshop.git"
+    git      = "https://github.com/OpenSpeedShop/openspeedshop.git"
 
-    # Use when the git repository is available
-    version('2.3.1.4', branch='2.3.1.4',
-            git='https://github.com/OpenSpeedShop/openspeedshop.git')
-
-    version('2.3.1.3', branch='2.3.1.3',
-            git='https://github.com/OpenSpeedShop/openspeedshop.git')
-
-    version('develop', branch='master',
-            git='https://github.com/OpenSpeedShop/openspeedshop.git')
+    version('develop', branch='master')
+    version('2.3.1.4', branch='2.3.1.4')
+    version('2.3.1.3', branch='2.3.1.3')
 
     variant('runtime', default=False,
             description="build only the runtime libraries and collectors.")
diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py
index 16eb54eb90..462b1abe4f 100644
--- a/var/spack/repos/builtin/packages/openspeedshop/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop/package.py
@@ -63,17 +63,11 @@ class Openspeedshop(CMakePackage):
     """
 
     homepage = "http://www.openspeedshop.org"
-    url = "https://github.com/OpenSpeedShop/openspeedshop.git"
+    git      = "https://github.com/OpenSpeedShop/openspeedshop.git"
 
-    # Use when the git repository is available
-    version('2.3.1.4', branch='2.3.1.4',
-            git='https://github.com/OpenSpeedShop/openspeedshop.git')
-
-    version('2.3.1.3', branch='2.3.1.3',
-            git='https://github.com/OpenSpeedShop/openspeedshop.git')
-
-    version('develop', branch='master',
-            git='https://github.com/OpenSpeedShop/openspeedshop.git')
+    version('develop', branch='master')
+    version('2.3.1.4', branch='2.3.1.4')
+    version('2.3.1.3', branch='2.3.1.3')
 
     variant('runtime', default=False,
             description="build only the runtime libraries and collectors.")
diff --git a/var/spack/repos/builtin/packages/pacbio-daligner/package.py b/var/spack/repos/builtin/packages/pacbio-daligner/package.py
index 2d4866f65e..10b7297810 100644
--- a/var/spack/repos/builtin/packages/pacbio-daligner/package.py
+++ b/var/spack/repos/builtin/packages/pacbio-daligner/package.py
@@ -30,11 +30,9 @@ class PacbioDaligner(MakefilePackage):
        required for some pacbio utilities."""
 
     homepage = "https://github.com/PacificBiosciences/DALIGNER"
-    url      = "https://github.com/PacificBiosciences/DALIGNER"
+    git      = "https://github.com/PacificBiosciences/DALIGNER.git"
 
-    version('2017-08-05',
-            git='https://github.com/PacificBiosciences/DALIGNER.git',
-            commit='0fe5240d2cc6b55bf9e04465b700b76110749c9d')
+    version('2017-08-05', commit='0fe5240d2cc6b55bf9e04465b700b76110749c9d')
 
     depends_on('gmake', type='build')
     depends_on('pacbio-dazz-db')
diff --git a/var/spack/repos/builtin/packages/pacbio-damasker/package.py b/var/spack/repos/builtin/packages/pacbio-damasker/package.py
index 674a6d35e0..326a543a5f 100644
--- a/var/spack/repos/builtin/packages/pacbio-damasker/package.py
+++ b/var/spack/repos/builtin/packages/pacbio-damasker/package.py
@@ -30,11 +30,9 @@ class PacbioDamasker(MakefilePackage):
        required for some pacbio utilities."""
 
     homepage = "https://github.com/PacificBiosciences/DAMASKER"
-    url      = "https://github.com/PacificBiosciences/DAMASKER"
+    git      = "https://github.com/PacificBiosciences/DAMASKER.git"
 
-    version('2017-02-11',
-            git='https://github.com/PacificBiosciences/DAMASKER.git',
-            commit='144244b77d52cb785cb1b3b8ae3ab6f3f0c63264')
+    version('2017-02-11', commit='144244b77d52cb785cb1b3b8ae3ab6f3f0c63264')
 
     depends_on('gmake', type='build')
 
diff --git a/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py b/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py
index 328e307b63..5f8eb9f3a6 100644
--- a/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py
+++ b/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py
@@ -31,11 +31,9 @@ class PacbioDazzDb(MakefilePackage):
        required for some pacbio utilities."""
 
     homepage = "https://github.com/PacificBiosciences/DAZZ_DB"
-    url      = "https://github.com/PacificBiosciences/DAZZ_DB"
+    git      = "https://github.com/PacificBiosciences/DAZZ_DB.git"
 
-    version('2017-04-10',
-            git='https://github.com/PacificBiosciences/DAZZ_DB.git',
-            commit='f29d27d51f460563481cd227d17f4bdc5e288365')
+    version('2017-04-10', commit='f29d27d51f460563481cd227d17f4bdc5e288365')
 
     depends_on('gmake', type='build')
 
diff --git a/var/spack/repos/builtin/packages/pacbio-dextractor/package.py b/var/spack/repos/builtin/packages/pacbio-dextractor/package.py
index a567c22e9a..a1c70fea09 100644
--- a/var/spack/repos/builtin/packages/pacbio-dextractor/package.py
+++ b/var/spack/repos/builtin/packages/pacbio-dextractor/package.py
@@ -30,11 +30,9 @@ class PacbioDextractor(MakefilePackage):
        fork required by some pacbio utilities."""
 
     homepage = "https://github.com/PacificBiosciences/DEXTRACTOR"
-    url      = "https://github.com/PacificBiosciences/DEXTRACTOR"
+    git      = "https://github.com/PacificBiosciences/DEXTRACTOR.git"
 
-    version('2016-08-09',
-            git='https://github.com/PacificBiosciences/DEXTRACTOR.git',
-            commit='89726800346d0bed15d98dcc577f4c7733aab4b1')
+    version('2016-08-09', commit='89726800346d0bed15d98dcc577f4c7733aab4b1')
 
     depends_on('hdf5')
     depends_on('gmake', type='build')
diff --git a/var/spack/repos/builtin/packages/papyrus/package.py b/var/spack/repos/builtin/packages/papyrus/package.py
index bfe3807fab..a8bab0ed46 100644
--- a/var/spack/repos/builtin/packages/papyrus/package.py
+++ b/var/spack/repos/builtin/packages/papyrus/package.py
@@ -30,9 +30,9 @@ class Papyrus(CMakePackage):
 
     homepage = "https://code.ornl.gov/eck/papyrus"
     url      = "https://code.ornl.gov/eck/papyrus/repository/archive.tar.bz2?ref=v1.0.0"
+    git      = "https://code.ornl.gov/eck/papyrus.git"
 
-    version('develop', branch='master',
-            git='https://code.ornl.gov/eck/papyrus.git')
+    version('develop', branch='master')
     version('1.0.0', 'fe0fca073c3604110f0507f375d71e64')
 
     depends_on('mpi')
diff --git a/var/spack/repos/builtin/packages/paradiseo/package.py b/var/spack/repos/builtin/packages/paradiseo/package.py
index 4fd587bdc8..a571533e34 100644
--- a/var/spack/repos/builtin/packages/paradiseo/package.py
+++ b/var/spack/repos/builtin/packages/paradiseo/package.py
@@ -28,19 +28,19 @@ from spack import *
 class Paradiseo(CMakePackage):
     """A C++ white-box object-oriented framework dedicated to the reusable
        design of metaheuristics."""
+
     homepage = "http://paradiseo.gforge.inria.fr/"
+    git      = "https://gforge.inria.fr/git/paradiseo/paradiseo.git"
 
     # Installing from the development version is a better option at this
     # point than using the very old supplied packages
-    version('head', git='https://gforge.inria.fr/git/paradiseo/paradiseo.git')
+    version('head')
 
     # This is a version that the package formula author has tested
     # successfully.  However, the clone is very large (~1Gb git
     # history). The history in the head version has been trimmed
     # significantly.
-    version(
-        'dev-safe', git='https://gforge.inria.fr/git/paradiseo/paradiseo.git',
-        commit='dbb8fbe9a786efd4d1c26408ac1883442e7643a6')
+    version('dev-safe', commit='dbb8fbe9a786efd4d1c26408ac1883442e7643a6')
 
     variant('mpi',      default=True,
             description='Compile with parallel and distributed '
diff --git a/var/spack/repos/builtin/packages/parsimonator/package.py b/var/spack/repos/builtin/packages/parsimonator/package.py
index af2dda7a0a..b0a2e63a91 100644
--- a/var/spack/repos/builtin/packages/parsimonator/package.py
+++ b/var/spack/repos/builtin/packages/parsimonator/package.py
@@ -30,9 +30,9 @@ class Parsimonator(MakefilePackage):
        starting trees under parsimony for RAxML"""
 
     homepage = "http://www.exelixis-lab.org/"
-    url      = "https://github.com/stamatak/Parsimonator-1.0.2"
+    git      = "https://github.com/stamatak/Parsimonator-1.0.2.git"
 
-    version('1.0.2', git='https://github.com/stamatak/Parsimonator-1.0.2.git', commit='78368c6ab1e9adc7e9c6ec9256dd7ff2a5bb1b0a')
+    version('1.0.2', commit='78368c6ab1e9adc7e9c6ec9256dd7ff2a5bb1b0a')
 
     variant('sse', default=True, description='Enable SSE in order to substantially speed up execution')
     variant('avx', default=False, description='Enable AVX in order to substantially speed up execution')
diff --git a/var/spack/repos/builtin/packages/parsplice/package.py b/var/spack/repos/builtin/packages/parsplice/package.py
index 66fe7c6ebb..0b89600541 100644
--- a/var/spack/repos/builtin/packages/parsplice/package.py
+++ b/var/spack/repos/builtin/packages/parsplice/package.py
@@ -31,11 +31,12 @@ class Parsplice(CMakePackage):
 
     homepage = "https://gitlab.com/exaalt/parsplice"
     url      = "https://gitlab.com/api/v4/projects/exaalt%2Fparsplice/repository/archive.tar.gz?sha=v1.1"
+    git      = "https://gitlab.com/exaalt/parsplice.git"
 
     tags = ['ecp', 'ecp-apps']
 
+    version('develop', branch='master')
     version('1.1', '3a72340d49d731a076e8942f2ae2f4e9')
-    version('develop', git='https://gitlab.com/exaalt/parsplice', branch='master')
 
     depends_on("cmake@3.1:", type='build')
     depends_on("berkeley-db")
diff --git a/var/spack/repos/builtin/packages/pbmpi/package.py b/var/spack/repos/builtin/packages/pbmpi/package.py
index 4ea4eb7a20..ba7099d711 100644
--- a/var/spack/repos/builtin/packages/pbmpi/package.py
+++ b/var/spack/repos/builtin/packages/pbmpi/package.py
@@ -30,9 +30,9 @@ class Pbmpi(MakefilePackage):
     """
 
     homepage = "http://megasun.bch.umontreal.ca/People/lartillot/www/index.htm"
-    url      = "https://github.com/bayesiancook/pbmpi"
+    git      = "https://github.com/bayesiancook/pbmpi.git"
 
-    version('partition', git='https://github.com/bayesiancook/pbmpi.git', branch='partition')
+    version('partition', branch='partition')
 
     depends_on('mpi')
     depends_on('libfabric')
diff --git a/var/spack/repos/builtin/packages/pegtl/package.py b/var/spack/repos/builtin/packages/pegtl/package.py
index c297854797..0896371c3f 100644
--- a/var/spack/repos/builtin/packages/pegtl/package.py
+++ b/var/spack/repos/builtin/packages/pegtl/package.py
@@ -35,7 +35,8 @@ class Pegtl(CMakePackage):
 
     homepage = "https://github.com/taocpp/PEGTL"
     url      = "https://github.com/taocpp/PEGTL/tarball/1.3.1"
+    git      = "https://github.com/taocpp/PEGTL.git"
 
-    version('develop', git='https://github.com/taocpp/PEGTL', branch='master')
+    version('develop', branch='master')
     version('2.1.4', 'e5288b6968e6e910287fce93dc5557bf')
     version('2.0.0', 'c772828e7188459338a920c21f9896db')
diff --git a/var/spack/repos/builtin/packages/percept/package.py b/var/spack/repos/builtin/packages/percept/package.py
index db1ac11452..f3e62dc9f8 100644
--- a/var/spack/repos/builtin/packages/percept/package.py
+++ b/var/spack/repos/builtin/packages/percept/package.py
@@ -31,12 +31,11 @@ class Percept(CMakePackage):
     """
 
     homepage = "https://github.com/PerceptTools/percept"
-    url      = "https://github.com/PerceptTools/percept.git"
+    git      = "https://github.com/PerceptTools/percept.git"
 
     # This package file was created at percept
     # commit dc1c8ec0175213146ac139946beca185a84c22e8
-    version('develop',
-            git='https://github.com/PerceptTools/percept.git', branch='master')
+    version('develop', branch='master')
 
     depends_on('googletest~shared')
     depends_on('opennurbs@percept')
diff --git a/var/spack/repos/builtin/packages/perl-star-fusion/package.py b/var/spack/repos/builtin/packages/perl-star-fusion/package.py
index 68ba8af1f8..7e23809a8c 100644
--- a/var/spack/repos/builtin/packages/perl-star-fusion/package.py
+++ b/var/spack/repos/builtin/packages/perl-star-fusion/package.py
@@ -34,9 +34,9 @@ class PerlStarFusion(Package):
     and spanning reads to a reference annotation set."""
 
     homepage = "https://github.com/STAR-Fusion/STAR-Fusion"
-    url      = "https://github.com/STAR-Fusion/STAR-Fusion.git"
+    git      = "https://github.com/STAR-Fusion/STAR-Fusion.git"
 
-    version('master', git='https://github.com/STAR-Fusion/STAR-Fusion.git', commit='a16a0a8')
+    version('master', commit='a16a0a8')
 
     extends('perl')
 
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py
index 52d7314e91..a376303e04 100644
--- a/var/spack/repos/builtin/packages/petsc/package.py
+++ b/var/spack/repos/builtin/packages/petsc/package.py
@@ -35,12 +35,13 @@ class Petsc(Package):
     """
 
     homepage = "http://www.mcs.anl.gov/petsc/index.html"
-    url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.5.3.tar.gz"
+    url      = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.5.3.tar.gz"
+    git      = "https://bitbucket.org/petsc/petsc.git"
 
     maintainers = ['balay', 'barrysmith', 'jedbrown']
 
-    version('develop', git='https://bitbucket.org/petsc/petsc.git', branch='master')
-    version('xsdk-0.2.0', git='https://bitbucket.org/petsc/petsc.git', tag='xsdk-0.2.0')
+    version('develop', branch='master')
+    version('xsdk-0.2.0', tag='xsdk-0.2.0')
 
     version('3.9.3', '7b71d705f66f9961cb0e2da3f9da79a1')
     version('3.9.2', '8bedc0cd8c8603d54bfd99a6e8f77b3d')
diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py
index 47474e54c9..2f5321406d 100644
--- a/var/spack/repos/builtin/packages/pflotran/package.py
+++ b/var/spack/repos/builtin/packages/pflotran/package.py
@@ -32,15 +32,16 @@ class Pflotran(AutotoolsPackage):
     """
 
     homepage = "http://www.pflotran.org"
+    git      = "https://bitbucket.org/pflotran/pflotran.git"
 
-    version('develop', git='https://bitbucket.org/pflotran/pflotran')
-    version('xsdk-0.2.0', git='https://bitbucket.org/pflotran/pflotran', tag='master')
-    version('xsdk-0.3.0', git='https://bitbucket.org/pflotran/pflotran', branch='release/xsdk-0.3.0')
+    version('develop')
+    version('xsdk-0.2.0', tag='master')
+    version('xsdk-0.3.0', branch='release/xsdk-0.3.0')
 
     depends_on('mpi')
     depends_on('hdf5@1.8.12:+mpi+fortran')
     depends_on('petsc@develop+hdf5+metis', when='@develop')
-    depends_on('petsc@xsdk-0.2.0+hdf5+metis', when='@xsdk-0.2.0')    
+    depends_on('petsc@xsdk-0.2.0+hdf5+metis', when='@xsdk-0.2.0')
     depends_on('petsc@3.8.0:+hdf5+metis', when='@xsdk-0.3.0')
 
     parallel = False
diff --git a/var/spack/repos/builtin/packages/pgmath/package.py b/var/spack/repos/builtin/packages/pgmath/package.py
index 64742813db..9358d353ce 100644
--- a/var/spack/repos/builtin/packages/pgmath/package.py
+++ b/var/spack/repos/builtin/packages/pgmath/package.py
@@ -28,10 +28,12 @@ from spack import *
 
 class Pgmath(CMakePackage):
     """Flang's math library"""
+
     homepage = "https://github.com/flang-compiler/flang"
-    url      = "https://github.com/flang-compiler/flang/archive/pgmath_20180319.tar.gz"
+    git      = "https://github.com/flang-compiler/flang"
 
-    version('develop', git='https://github.com/flang-compiler/flang', branch='master')
+    version('develop', branch='master')
 
     conflicts("%gcc@:7.1.9999")
+
     root_cmakelists_dir = 'runtime/libpgmath'
diff --git a/var/spack/repos/builtin/packages/phasta/package.py b/var/spack/repos/builtin/packages/phasta/package.py
index 7308c70349..24f97c5c66 100644
--- a/var/spack/repos/builtin/packages/phasta/package.py
+++ b/var/spack/repos/builtin/packages/phasta/package.py
@@ -30,12 +30,10 @@ class Phasta(CMakePackage):
        (PHASTA) of compressible and incompressible Navier Stokes equations."""
 
     homepage = "https://www.scorec.rpi.edu/software.php"
-    url      = "https://github.com/PHASTA/phasta.git"
+    git      = "https://github.com/PHASTA/phasta.git"
 
-    version('0.0.1', git='https://github.com/PHASTA/phasta.git',
-        commit='11f431f2d1a53a529dab4b0f079ab8aab7ca1109')
-    version('develop', git='https://github.com/PHASTA/phasta.git',
-        branch='master')
+    version('develop', branch='master')
+    version('0.0.1', commit='11f431f2d1a53a529dab4b0f079ab8aab7ca1109')
 
     depends_on('mpi')
 
diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py
index 7ffd34099b..95b16488ff 100644
--- a/var/spack/repos/builtin/packages/phist/package.py
+++ b/var/spack/repos/builtin/packages/phist/package.py
@@ -38,12 +38,11 @@ class Phist(CMakePackage):
     """
 
     homepage = "https://bitbucket.org/essex/phist/"
-    url = 'https://bitbucket.org/essex/phist/get/phist-1.4.3.tar.gz'
+    url      = "https://bitbucket.org/essex/phist/get/phist-1.4.3.tar.gz"
+    git      = "https://bitbucket.org/essex/phist/phist.git"
 
-    version('develop',
-            git='https://bitbucket.org/essex/phist/phist.git', branch='devel')
-    version('master',
-            git='https://bitbucket.org/essex/phist/phist.git', branch='master')
+    version('develop', branch='devel')
+    version('master', branch='master')
     version('1.6.0', '751f855230d6227b972b5ab7bce2c65f')
     version('1.4.3', 'af3300378d4282366d148e38c3a3199a')
 
diff --git a/var/spack/repos/builtin/packages/pidx/package.py b/var/spack/repos/builtin/packages/pidx/package.py
index 75a2886b80..c8d130c1ad 100644
--- a/var/spack/repos/builtin/packages/pidx/package.py
+++ b/var/spack/repos/builtin/packages/pidx/package.py
@@ -33,9 +33,9 @@ class Pidx(CMakePackage):
     """
 
     homepage = "http://www.cedmav.com/pidx"
+    git      = "https://github.com/sci-visus/PIDX.git"
 
-    version('1.0', git='https://github.com/sci-visus/PIDX.git',
-            commit='6afa1cf71d1c41263296dc049c8fabaf73c296da')
+    version('1.0', commit='6afa1cf71d1c41263296dc049c8fabaf73c296da')
 
     depends_on('cmake@2.8.4:', type='build')
     depends_on('mpi')
diff --git a/var/spack/repos/builtin/packages/piranha/package.py b/var/spack/repos/builtin/packages/piranha/package.py
index 4c75a77fe2..21a6324d7b 100644
--- a/var/spack/repos/builtin/packages/piranha/package.py
+++ b/var/spack/repos/builtin/packages/piranha/package.py
@@ -32,9 +32,10 @@ class Piranha(CMakePackage):
 
     homepage = "https://bluescarni.github.io/piranha/sphinx/"
     url      = "https://github.com/bluescarni/piranha/archive/v0.5.tar.gz"
+    git      = "https://github.com/bluescarni/piranha.git"
 
+    version('develop', git=git)
     version('0.5', '99546bae2be115737b6316751eb0b84d')
-    version('develop', git='https://github.com/bluescarni/piranha.git')
 
     variant('python',   default=True,
             description='Build the Python bindings')
diff --git a/var/spack/repos/builtin/packages/pism/package.py b/var/spack/repos/builtin/packages/pism/package.py
index fd9f2a30fb..33e76e1aa5 100644
--- a/var/spack/repos/builtin/packages/pism/package.py
+++ b/var/spack/repos/builtin/packages/pism/package.py
@@ -30,19 +30,14 @@ class Pism(CMakePackage):
 
     homepage = "http://pism-docs.org/wiki/doku.php:="
     url      = "https://github.com/pism/pism/archive/v0.7.3.tar.gz"
+    git      = "https://github.com/pism/pism.git"
 
     maintainers = ['citibeth']
 
+    version('develop', branch='dev')
     version('0.7.3', '7cfb034100d99d5c313c4ac06b7f17b6')
-
-    version('0.7.x', git='https://github.com/pism/pism.git',
-        branch='stable0.7')
-
-    version('icebin', git='https://github.com/pism/pism.git',
-        branch='efischer/dev')
-
-    version('develop', git='https://github.com/pism/pism.git',
-        branch='dev')
+    version('0.7.x', branch='stable0.7')
+    version('icebin', branch='efischer/dev')
 
     variant('extra', default=False,
             description='Build extra executables (testing/verification)')
diff --git a/var/spack/repos/builtin/packages/pngwriter/package.py b/var/spack/repos/builtin/packages/pngwriter/package.py
index ba8544ab1b..f65b0d8cd3 100644
--- a/var/spack/repos/builtin/packages/pngwriter/package.py
+++ b/var/spack/repos/builtin/packages/pngwriter/package.py
@@ -37,12 +37,12 @@ class Pngwriter(CMakePackage):
 
     homepage = "http://pngwriter.sourceforge.net/"
     url      = "https://github.com/pngwriter/pngwriter/archive/0.5.6.tar.gz"
+    git      = "https://github.com/pngwriter/pngwriter.git"
+
     maintainers = ['ax3l']
 
-    version('develop', branch='dev',
-            git='https://github.com/pngwriter/pngwriter.git')
-    version('master', branch='master',
-            git='https://github.com/pngwriter/pngwriter.git')
+    version('develop', branch='dev')
+    version('master', branch='master')
     version('0.7.0', 'a68aa0889f120f5bb07848afce278a95')
     version('0.6.0', '0a19bc55c5f6379fea7343752fd3ffae')
     version('0.5.6', 'c13bd1fdc0e331a246e6127b5f262136')
diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py
index f4fef47af4..17288b1080 100644
--- a/var/spack/repos/builtin/packages/pocl/package.py
+++ b/var/spack/repos/builtin/packages/pocl/package.py
@@ -35,12 +35,11 @@ class Pocl(CMakePackage):
     GPUs/accelerators."""
 
     homepage = "http://portablecl.org"
-    url = "http://portablecl.org/downloads/pocl-0.13.tar.gz"
+    url      = "http://portablecl.org/downloads/pocl-0.13.tar.gz"
+    git      = "https://github.com/pocl/pocl.git"
 
-    version("master", git="https://github.com/pocl/pocl.git")
+    version("master", git=git)
     version('0.14', '1d35f09299e76b9e3918c42826555194')
-    # version("0.14-rc",
-    #         git="https://github.com/pocl/pocl.git", branch="release_0_14")
     version("0.13", "344480864d4269f2f63f1509395898bd")
     version("0.12", "e197ba3aa01a35f40581c48e053330dd")
     version("0.11", "9be0640cde2983062c47393d9e8e8fe7")
diff --git a/var/spack/repos/builtin/packages/portage/package.py b/var/spack/repos/builtin/packages/portage/package.py
index b70139c3ed..ed7667f308 100644
--- a/var/spack/repos/builtin/packages/portage/package.py
+++ b/var/spack/repos/builtin/packages/portage/package.py
@@ -32,12 +32,12 @@ class Portage(CMakePackage):
        remapping library for transfer of field data between meshes.
     """
     homepage = "http://portage.lanl.gov/"
-    url      = "https://github.com/laristra/portage/tarball/v1.0"
+    git      = "https://github.com/laristra/portage.git"
 
     # tarballs don't have submodules, so use git tags
-    version('1.1.1', git='https://github.com/laristra/portage', tag='v1.1.1', submodules=True)
-    version('1.1.0', git='https://github.com/laristra/portage', tag='v1.1.0', submodules=True)
-    version('develop', git='https://github.com/laristra/portage', branch='master', submodules=True)
+    version('develop', branch='master', submodules=True)
+    version('1.1.1', tag='v1.1.1', submodules=True)
+    version('1.1.0', tag='v1.1.0', submodules=True)
 
     variant('mpi', default=True, description='Support MPI')
 
diff --git a/var/spack/repos/builtin/packages/precice/package.py b/var/spack/repos/builtin/packages/precice/package.py
index 69e7d16592..ef106a74a8 100644
--- a/var/spack/repos/builtin/packages/precice/package.py
+++ b/var/spack/repos/builtin/packages/precice/package.py
@@ -32,10 +32,10 @@ class Precice(CMakePackage):
     a simulation."""
 
     homepage = 'https://www.precice.org'
-    gitrepo  = 'https://github.com/precice/precice.git'
+    git      = 'https://github.com/precice/precice.git'
 
     # Skip version 1.1.1 entirely, the cmake was lacking install.
-    version('develop', branch='develop', git=gitrepo)
+    version('develop', branch='develop')
 
     variant('mpi', default=True, description='Enable MPI support')
     variant('petsc', default=False, description='Enable PETSc support')
diff --git a/var/spack/repos/builtin/packages/ps-lite/package.py b/var/spack/repos/builtin/packages/ps-lite/package.py
index ea9cc34ed4..e11831eef1 100644
--- a/var/spack/repos/builtin/packages/ps-lite/package.py
+++ b/var/spack/repos/builtin/packages/ps-lite/package.py
@@ -30,11 +30,10 @@ class PsLite(CMakePackage):
     of the parameter server framework."""
 
     homepage = "https://github.com/dmlc/ps-lite"
-    url      = "https://github.com/dmlc/ps-lite.git"
+    git      = "https://github.com/dmlc/ps-lite.git"
 
-    version('master', git='https://github.com/dmlc/ps-lite.git', branch='master')
-    version('20170328', git='https://github.com/dmlc/ps-lite.git',
-            commit='acdb698fa3bb80929ef83bb37c705f025e119b82')
+    version('master', branch='master')
+    version('20170328', commit='acdb698fa3bb80929ef83bb37c705f025e119b82')
 
     depends_on('protobuf@3:')
     depends_on('zeromq')
diff --git a/var/spack/repos/builtin/packages/psm/package.py b/var/spack/repos/builtin/packages/psm/package.py
index ba65f963d3..7fee9318e1 100644
--- a/var/spack/repos/builtin/packages/psm/package.py
+++ b/var/spack/repos/builtin/packages/psm/package.py
@@ -30,9 +30,10 @@ class Psm(MakefilePackage):
 
     homepage = "https://github.com/intel/psm"
     url      = "https://github.com/intel/psm/archive/v3.3.tar.gz"
+    git      = "https://github.com/intel/psm.git"
 
     version('3.3', '031eb27688c932867d55054e76d00875', preferred=True)
-    version('2017-04-28', git='https://github.com/intel/psm.git', commit='604758e')
+    version('2017-04-28', commit='604758e')
 
     conflicts('%gcc@6:', when='@3.3')
 
diff --git a/var/spack/repos/builtin/packages/psmc/package.py b/var/spack/repos/builtin/packages/psmc/package.py
index 45dfeff9ec..bd1f27aa4b 100644
--- a/var/spack/repos/builtin/packages/psmc/package.py
+++ b/var/spack/repos/builtin/packages/psmc/package.py
@@ -30,8 +30,9 @@ class Psmc(MakefilePackage):
     (PSMC) model"""
 
     homepage = "https://github.com/lh3/psmc"
+    git      = "https://github.com/lh3/psmc.git"
 
-    version('2016-1-21', git='https://github.com/lh3/psmc.git', commit='e5f7df5d00bb75ec603ae0beff62c0d7e37640b9')
+    version('2016-1-21', commit='e5f7df5d00bb75ec603ae0beff62c0d7e37640b9')
 
     def setup_environment(self, spack_env, run_env):
         run_env.prepend_path('PATH', prefix.bin.utils)
diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py
index a6ec15af2b..0e23420c8a 100644
--- a/var/spack/repos/builtin/packages/pumi/package.py
+++ b/var/spack/repos/builtin/packages/pumi/package.py
@@ -36,12 +36,10 @@ class Pumi(CMakePackage):
        and dynamic load balancing."""
 
     homepage = "https://www.scorec.rpi.edu/pumi"
-    url      = "https://github.com/SCOREC/core.git"
+    git      = "https://github.com/SCOREC/core.git"
 
-    version('2.1.0', git='https://github.com/SCOREC/core.git',
-        commit='840fbf6ec49a63aeaa3945f11ddb224f6055ac9f')
-    version('develop', git='https://github.com/SCOREC/core.git',
-        branch='master')
+    version('develop', branch='master')
+    version('2.1.0', commit='840fbf6ec49a63aeaa3945f11ddb224f6055ac9f')
 
     variant('zoltan', default=False, description='Enable Zoltan Features')
     variant('fortran', default=False, description='Enable FORTRAN interface')
diff --git a/var/spack/repos/builtin/packages/pxz/package.py b/var/spack/repos/builtin/packages/pxz/package.py
index 1c7084e392..f6acaee49f 100644
--- a/var/spack/repos/builtin/packages/pxz/package.py
+++ b/var/spack/repos/builtin/packages/pxz/package.py
@@ -30,8 +30,9 @@ class Pxz(MakefilePackage):
 
     homepage = "https://jnovy.fedorapeople.org/pxz/pxz.html"
     url      = "http://jnovy.fedorapeople.org/pxz/pxz-4.999.9beta.20091201git.tar.xz"
+    git      = "https://github.com/jnovy/pxz.git"
 
-    version('develop', git='https://github.com/jnovy/pxz') 
+    version('develop', git=git)
     version('4.999.9beta.20091201git', '4ae3926185978f5c95c9414dc4634451')
 
     depends_on('lzma')
diff --git a/var/spack/repos/builtin/packages/py-adios/package.py b/var/spack/repos/builtin/packages/py-adios/package.py
index 40b8faad1a..70b9daff32 100644
--- a/var/spack/repos/builtin/packages/py-adios/package.py
+++ b/var/spack/repos/builtin/packages/py-adios/package.py
@@ -30,10 +30,11 @@ class PyAdios(PythonPackage):
 
     homepage = "https://www.olcf.ornl.gov/center-projects/adios/"
     url      = "https://github.com/ornladios/ADIOS/archive/v1.12.0.tar.gz"
+    git      = "https://github.com/ornladios/ADIOS.git"
+
     maintainers = ['ax3l']
 
-    version('develop', git='https://github.com/ornladios/ADIOS.git',
-            branch='master')
+    version('develop', branch='master')
     version('1.13.0', '68af36b821debbdf4748b20320a990ce')
     version('1.12.0', '84a1c71b6698009224f6f748c5257fc9')
     version('1.11.1', '5639bfc235e50bf17ba9dafb14ea4185')
diff --git a/var/spack/repos/builtin/packages/py-dryscrape/package.py b/var/spack/repos/builtin/packages/py-dryscrape/package.py
index 83adbb8227..8382b9ad72 100644
--- a/var/spack/repos/builtin/packages/py-dryscrape/package.py
+++ b/var/spack/repos/builtin/packages/py-dryscrape/package.py
@@ -31,9 +31,9 @@ class PyDryscrape(PythonPackage):
 
     homepage = "https://github.com/niklasb/dryscrape"
     url      = "https://pypi.io/packages/source/d/dryscrape/dryscrape-1.0.tar.gz"
+    git      = "https://github.com/niklasb/dryscrape.git"
 
-    version('develop', git="https://github.com/niklasb/dryscrape",
-            branch="master")
+    version('develop', branch='master')
     version('1.0', '267e380a8efaf9cd8fd94de1639d3198')
 
     depends_on('py-lxml', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-edffile/package.py b/var/spack/repos/builtin/packages/py-edffile/package.py
index 5a44a748c2..a6159d5760 100644
--- a/var/spack/repos/builtin/packages/py-edffile/package.py
+++ b/var/spack/repos/builtin/packages/py-edffile/package.py
@@ -29,12 +29,11 @@ class PyEdffile(PythonPackage):
     """Generic class for Edf files manipulation."""
 
     homepage = "https://github.com/vasole/pymca/blob/master/PyMca5/PyMcaIO/EdfFile.py"
-    url      = "https://github.com/conda-forge/edffile-feedstock.git"
+    git      = "https://github.com/conda-forge/edffile-feedstock.git"
 
     import_modules = ['EdfFile']
 
-    version('5.0.0', git='https://github.com/conda-forge/edffile-feedstock.git',
-            commit='be5ab4199db9f8209c59e31874934b8536b52301')
+    version('5.0.0', commit='be5ab4199db9f8209c59e31874934b8536b52301')
 
     depends_on('py-setuptools', type='build')
     depends_on('py-numpy', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-espresso/package.py b/var/spack/repos/builtin/packages/py-espresso/package.py
index 19bf7bec31..a1a57c2413 100644
--- a/var/spack/repos/builtin/packages/py-espresso/package.py
+++ b/var/spack/repos/builtin/packages/py-espresso/package.py
@@ -38,15 +38,14 @@ class PyEspresso(CMakePackage):
        particle couplings to the LB fluid.
     """
     homepage = "http://espressomd.org/"
-    url      = "https://github.com/espressomd/espresso/tarball/v4.0"
+    git      = "https://github.com/espressomd/espresso.git"
 
-    version('develop', git='https://github.com/espressomd/espresso.git', branch='python')
+    version('develop', branch='python')
 
     depends_on("cmake@3.0:", type='build')
     depends_on("mpi")
     depends_on("boost+serialization+filesystem+system+python+mpi")
     extends("python")
-    depends_on("python")
-    depends_on("py-cython@0.23:")
-    depends_on("py-numpy")
+    depends_on("py-cython@0.23:", type="build")
+    depends_on("py-numpy", type=("build", "run"))
     depends_on("fftw")
diff --git a/var/spack/repos/builtin/packages/py-espressopp/package.py b/var/spack/repos/builtin/packages/py-espressopp/package.py
index 2a3c17ab8f..4b43bc9fe6 100644
--- a/var/spack/repos/builtin/packages/py-espressopp/package.py
+++ b/var/spack/repos/builtin/packages/py-espressopp/package.py
@@ -34,11 +34,12 @@ class PyEspressopp(CMakePackage):
     """
     homepage = "https://espressopp.github.io"
     url      = "https://github.com/espressopp/espressopp/tarball/v1.9.4.1"
+    git      = "https://github.com/espressopp/espressopp.git"
 
-    version('develop', git='https://github.com/espressopp/espressopp.git', branch='master')
-    version('1.9.5', '13a93c30b07132b5e5fa0d828aa17d79')
+    version('develop', branch='master')
+    version('1.9.5',   '13a93c30b07132b5e5fa0d828aa17d79')
     version('1.9.4.1', '0da74a6d4e1bfa6a2a24fca354245a4f')
-    version('1.9.4', 'f2a27993a83547ad014335006eea74ea')
+    version('1.9.4',   'f2a27993a83547ad014335006eea74ea')
 
     variant('ug', default=False, description='Build user guide')
     variant('pdf', default=False, description='Build user guide in pdf format')
diff --git a/var/spack/repos/builtin/packages/py-fiscalyear/package.py b/var/spack/repos/builtin/packages/py-fiscalyear/package.py
index 133677264a..45f44261ed 100644
--- a/var/spack/repos/builtin/packages/py-fiscalyear/package.py
+++ b/var/spack/repos/builtin/packages/py-fiscalyear/package.py
@@ -33,11 +33,12 @@ class PyFiscalyear(PythonPackage):
 
     homepage = "https://github.com/adamjstewart/fiscalyear"
     url      = "https://pypi.io/packages/source/f/fiscalyear/fiscalyear-0.1.0.tar.gz"
+    git      = "https://github.com/adamjstewart/fiscalyear.git"
 
+    maintainers = ['adamjstewart']
     import_modules = ['fiscalyear']
 
-    version('master', branch='master',
-            git='https://github.com/adamjstewart/fiscalyear.git')
+    version('master', branch='master')
     version('0.1.0', '30e36b259f3e72e4929abbf259335742')
 
     depends_on('python@2.5:')
diff --git a/var/spack/repos/builtin/packages/py-fparser/package.py b/var/spack/repos/builtin/packages/py-fparser/package.py
index cebcddb79b..0b6a9c7da6 100644
--- a/var/spack/repos/builtin/packages/py-fparser/package.py
+++ b/var/spack/repos/builtin/packages/py-fparser/package.py
@@ -31,11 +31,11 @@ class PyFparser(PythonPackage):
 
     homepage = "https://github.com/stfc/fparser"
     url      = "https://github.com/stfc/fparser/archive/0.0.5.tar.gz"
-    giturl   = "https://github.com/stfc/fparser.git"
+    git      = "https://github.com/stfc/fparser.git"
 
+    version('develop', branch='master')
     version('0.0.6', '15553fde76b4685fa8edb0a5472b1b53d308c3b8')
     version('0.0.5', '14630afdb8c8bd025e5504c5ab19d133aa8cf8c7')
-    version('develop', git=giturl, branch='master')
 
     depends_on('py-setuptools', type='build')
 
diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py
index 7324f137c3..ea7034b290 100644
--- a/var/spack/repos/builtin/packages/py-libensemble/package.py
+++ b/var/spack/repos/builtin/packages/py-libensemble/package.py
@@ -31,8 +31,9 @@ class PyLibensemble(PythonPackage):
 
     homepage = "https://libensemble.readthedocs.io"
     url      = "https://pypi.io/packages/source/l/libensemble/libensemble-0.2.0.tar.gz"
+    git      = "https://github.com/Libensemble/libensemble.git"
 
-    version('develop', git='https://github.com/Libensemble/libensemble.git', branch='master')
+    version('develop', branch='master')
     version('0.2.0', 'ee96047594a3f5a1533f24d3b1f365f9')
     version('0.1.0', '0c3d45dd139429de1a5273e5bd8e46ec')
 
diff --git a/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py b/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py
index 4b23651842..a01cc62b6a 100644
--- a/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py
+++ b/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py
@@ -30,8 +30,9 @@ class PyMgRastTools(PythonPackage):
     MG-RAST data."""
 
     homepage = "https://github.com/MG-RAST/MG-RAST-Tools"
+    git      = "https://github.com/MG-RAST/MG-RAST-Tools.git"
 
-    version('2018.04.17', git='https://github.com/MG-RAST/MG-RAST-Tools.git', commit='a40c6e6539ad0bc1c08e1b03dfc0a9759755a326')
+    version('2018.04.17', commit='a40c6e6539ad0bc1c08e1b03dfc0a9759755a326')
 
     depends_on('perl', type=('build', 'run'))
     depends_on('py-setuptools@28.0:', type='build')
diff --git a/var/spack/repos/builtin/packages/py-mpi4py/package.py b/var/spack/repos/builtin/packages/py-mpi4py/package.py
index c87a0a5abc..ccd850795a 100644
--- a/var/spack/repos/builtin/packages/py-mpi4py/package.py
+++ b/var/spack/repos/builtin/packages/py-mpi4py/package.py
@@ -30,12 +30,12 @@ class PyMpi4py(PythonPackage):
        Interface (MPI) standard. It is implemented on top of the
        MPI-1/MPI-2 specification and exposes an API which grounds on the
        standard MPI-2 C++ bindings.
-
     """
     homepage = "https://pypi.python.org/pypi/mpi4py"
     url      = "https://pypi.io/packages/source/m/mpi4py/mpi4py-3.0.0.tar.gz"
+    git      = "https://github.com/mpi4py/mpi4py.git"
 
-    version('develop', git='https://github.com/mpi4py/mpi4py.git', branch='master')
+    version('develop', branch='master')
     version('3.0.0', 'bfe19f20cef5e92f6e49e50fb627ee70')
     version('2.0.0', '4f7d8126d7367c239fd67615680990e3')
     version('1.3.1', 'dbe9d22bdc8ed965c23a7ceb6f32fc3c')
diff --git a/var/spack/repos/builtin/packages/py-opentuner/package.py b/var/spack/repos/builtin/packages/py-opentuner/package.py
index 9fcc51a402..141fa1243a 100644
--- a/var/spack/repos/builtin/packages/py-opentuner/package.py
+++ b/var/spack/repos/builtin/packages/py-opentuner/package.py
@@ -29,9 +29,9 @@ class PyOpentuner(PythonPackage):
     """An extensible framework for program autotuning."""
 
     homepage = "http://opentuner.org/"
-    url      = "https://github.com/jansel/opentuner"
+    git      = "https://github.com/jansel/opentuner.git"
 
-    version('0.8.0', git='https://github.com/jansel/opentuner', commit='4cb9135')
+    version('0.8.0', commit='4cb9135')
 
     # No support for Python 3 yet
     depends_on('python@2.7:2.8', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-proj/package.py b/var/spack/repos/builtin/packages/py-proj/package.py
index ee8451aa1c..60a09f3af0 100644
--- a/var/spack/repos/builtin/packages/py-proj/package.py
+++ b/var/spack/repos/builtin/packages/py-proj/package.py
@@ -27,13 +27,14 @@ from spack import *
 
 class PyProj(PythonPackage):
     """Python interface to the PROJ.4 Library."""
+
     homepage = "http://jswhit.github.io/pyproj/"
     url      = "https://github.com/jswhit/pyproj/tarball/v1.9.5.1rel"
+    git      = "https://www.github.com/jswhit/pyproj.git"
 
     # This is not a tagged release of pyproj.
     # The changes in this "version" fix some bugs, especially with Python3 use.
-    version('1.9.5.1.1', git='https://www.github.com/jswhit/pyproj.git',
-            commit='0be612cc9f972e38b50a90c946a9b353e2ab140f')
+    version('1.9.5.1.1', commit='0be612cc9f972e38b50a90c946a9b353e2ab140f')
     version('1.9.5.1', 'a4b80d7170fc82aee363d7f980279835')
 
     depends_on('py-cython', type='build')
diff --git a/var/spack/repos/builtin/packages/py-projectq/package.py b/var/spack/repos/builtin/packages/py-projectq/package.py
index e6d300dc63..690b8d958e 100644
--- a/var/spack/repos/builtin/packages/py-projectq/package.py
+++ b/var/spack/repos/builtin/packages/py-projectq/package.py
@@ -34,9 +34,9 @@ class PyProjectq(PythonPackage):
     classical computer of an actual quantum chip.
     """
 
-    # URL and HOMEPAGE
+    # Homepage and git repository
     homepage = "https://projectq.ch"
-    url      = "https://github.com/ProjectQ-Framework/ProjectQ/archive/v0.3.6.tar.gz"
+    git      = "https://github.com/projectq-framework/projectq.git"
 
     # Provided python modules
     import_modules = ['projectq', 'projectq.backends', 'projectq.cengines',
@@ -44,10 +44,8 @@ class PyProjectq(PythonPackage):
                       'projectq.setups', 'projectq.types']
 
     # Versions
-    version('develop', branch='develop',
-            git='https://github.com/projectq-framework/projectq.git')
-    version('0.3.6', commit='fa484fe037a3a1772127bbd00fe4628ddba34611',
-            git='https://github.com/projectq-framework/projectq.git')
+    version('develop', branch='develop')
+    version('0.3.6', commit='fa484fe037a3a1772127bbd00fe4628ddba34611')
 
     # Dependencies
     depends_on('py-setuptools', type=('build'))
diff --git a/var/spack/repos/builtin/packages/py-psyclone/package.py b/var/spack/repos/builtin/packages/py-psyclone/package.py
index 094d3c205f..e991296bd7 100644
--- a/var/spack/repos/builtin/packages/py-psyclone/package.py
+++ b/var/spack/repos/builtin/packages/py-psyclone/package.py
@@ -32,11 +32,10 @@ class PyPsyclone(PythonPackage):
 
     homepage = "https://github.com/stfc/PSyclone"
     url      = "https://github.com/stfc/PSyclone/archive/1.5.1.tar.gz"
-    giturl   = "https://github.com/stfc/PSyclone.git"
+    git      = "https://github.com/stfc/PSyclone.git"
 
-    version('1.5.1', git=giturl,
-            commit='eba7a097175b02f75dec70616cf267b7b3170d78')
-    version('develop', git=giturl, branch='master')
+    version('develop', branch='master')
+    version('1.5.1', commit='eba7a097175b02f75dec70616cf267b7b3170d78')
 
     depends_on('py-setuptools', type='build')
     depends_on('py-pyparsing', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py
index 69183be75c..79bab0cbca 100644
--- a/var/spack/repos/builtin/packages/py-pybind11/package.py
+++ b/var/spack/repos/builtin/packages/py-pybind11/package.py
@@ -36,9 +36,9 @@ class PyPybind11(CMakePackage):
 
     homepage = "https://pybind11.readthedocs.io"
     url      = "https://github.com/pybind/pybind11/archive/v2.1.0.tar.gz"
+    git      = "https://github.com/pybind/pybind11.git"
 
-    version('develop', branch='master',
-            git='https://github.com/pybind/pybind11.git')
+    version('develop', branch='master')
     version('2.2.3', '55b637945bbf47d99d2c906bf0c13f49')
     version('2.2.2', 'fc174e1bbfe7ec069af7eea86ec37b5c')
     version('2.2.1', 'bab1d46bbc465af5af3a4129b12bfa3b')
@@ -47,7 +47,7 @@ class PyPybind11(CMakePackage):
     version('2.1.0', '3cf07043d677d200720c928569635e12')
 
     depends_on('py-pytest', type='test')
-    depends_on('py-setuptools', type='build') 
+    depends_on('py-setuptools', type='build')
 
     extends('python')
 
diff --git a/var/spack/repos/builtin/packages/py-pynn/package.py b/var/spack/repos/builtin/packages/py-pynn/package.py
index 0bc23e1cee..51947b8e50 100644
--- a/var/spack/repos/builtin/packages/py-pynn/package.py
+++ b/var/spack/repos/builtin/packages/py-pynn/package.py
@@ -32,11 +32,11 @@ class PyPynn(PythonPackage):
 
     homepage = "http://neuralensemble.org/PyNN/"
     url      = "https://pypi.io/packages/source/P/PyNN/PyNN-0.8.3.tar.gz"
+    git      = "https://github.com/NeuralEnsemble/PyNN.git"
 
     version('0.9.1', '3b8a6c63dc59d7ac751029f84dcaf7e6')
     version('0.8.3', '28c63f898093806a57198e9271ed7b82')
-    version('0.8beta', git='https://github.com/NeuralEnsemble/PyNN.git',
-        commit='ffb0cb1661f2b0f2778db8f71865978fe7a7a6a4')
+    version('0.8beta', commit='ffb0cb1661f2b0f2778db8f71865978fe7a7a6a4')
     version('0.8.1', '7fb165ed5af35a115cb9c60991645ae6')
     version('0.7.5', 'd8280544e4c9b34b40fd372b16342841')
 
diff --git a/var/spack/repos/builtin/packages/py-pypeflow/package.py b/var/spack/repos/builtin/packages/py-pypeflow/package.py
index 1e05b57cfd..6788e502f1 100644
--- a/var/spack/repos/builtin/packages/py-pypeflow/package.py
+++ b/var/spack/repos/builtin/packages/py-pypeflow/package.py
@@ -30,11 +30,9 @@ class PyPypeflow(PythonPackage):
     library written in Python."""
 
     homepage = "https://github.com/PacificBiosciences/pypeFLOW"
-    url      = "https://github.com/PacificBiosciences/pypeFLOW"
+    git      = "https://github.com/PacificBiosciences/pypeFLOW.git"
 
-    version('2017-05-04',
-            git='https://github.com/PacificBiosciences/pypeFLOW.git',
-            commit='f23a1b290876bbdf130611000934ae4247158073')
+    version('2017-05-04', commit='f23a1b290876bbdf130611000934ae4247158073')
 
     depends_on('py-setuptools', type='build')
     depends_on('py-networkx@1.7:1.11', type=['build', 'run'])
diff --git a/var/spack/repos/builtin/packages/py-pytorch/package.py b/var/spack/repos/builtin/packages/py-pytorch/package.py
index b8c648d6fe..22c52e8aad 100644
--- a/var/spack/repos/builtin/packages/py-pytorch/package.py
+++ b/var/spack/repos/builtin/packages/py-pytorch/package.py
@@ -30,12 +30,10 @@ class PyPytorch(PythonPackage):
     with strong GPU acceleration."""
 
     homepage = "http://pytorch.org/"
-    url      = "https://github.com/pytorch/pytorch/archive/v0.3.1.tar.gz"
+    git      = "https://github.com/pytorch/pytorch.git"
 
-    version('0.4.0', git='https://github.com/pytorch/pytorch.git',
-            tag='v0.4.0', submodules=True)
-    version('0.3.1', git='https://github.com/pytorch/pytorch.git',
-            tag='v0.3.1', submodules=True)
+    version('0.4.0', tag='v0.4.0', submodules=True)
+    version('0.3.1', tag='v0.3.1', submodules=True)
 
     variant('cuda', default='False', description='Add GPU support')
     variant('cudnn', default='False', description='Add cuDNN support')
diff --git a/var/spack/repos/builtin/packages/py-spefile/package.py b/var/spack/repos/builtin/packages/py-spefile/package.py
index 618e17c34d..db82492efe 100644
--- a/var/spack/repos/builtin/packages/py-spefile/package.py
+++ b/var/spack/repos/builtin/packages/py-spefile/package.py
@@ -30,12 +30,11 @@ class PySpefile(PythonPackage):
        analysis of x-ray scattering experiments"""
 
     homepage = "https://github.com/conda-forge/spefile-feedstock"
-    url      = "https://github.com/conda-forge/spefile-feedstock.git"
+    git      = "https://github.com/conda-forge/spefile-feedstock.git"
 
     import_modules = ['spefile']
 
-    version('1.6', git='https://github.com/conda-forge/spefile-feedstock.git',
-            commit='24394e066da8dee5e7608f556ca0203c9db217f9')
+    version('1.6', commit='24394e066da8dee5e7608f556ca0203c9db217f9')
 
     depends_on('py-setuptools', type='build')
     depends_on('py-numpy', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-symengine/package.py b/var/spack/repos/builtin/packages/py-symengine/package.py
index 86625127fa..8b3187ef37 100644
--- a/var/spack/repos/builtin/packages/py-symengine/package.py
+++ b/var/spack/repos/builtin/packages/py-symengine/package.py
@@ -29,10 +29,11 @@ class PySymengine(PythonPackage):
     """Python wrappers for SymEngine, a symbolic manipulation library."""
 
     homepage = "https://github.com/symengine/symengine.py"
-    url = "https://github.com/symengine/symengine.py/archive/v0.2.0.tar.gz"
+    url      = "https://github.com/symengine/symengine.py/archive/v0.2.0.tar.gz"
+    git      = "https://github.com/symengine/symengine.py.git"
 
+    version('develop', git=git)
     version('0.2.0', 'e1d114fa12be4c8c7e9f24007e07718c')
-    version('develop', git='https://github.com/symengine/symengine.py.git')
 
     # Build dependencies
     depends_on('python@2.7:2.8,3.3:')
diff --git a/var/spack/repos/builtin/packages/py-theano/package.py b/var/spack/repos/builtin/packages/py-theano/package.py
index a8b32f5781..e5f77a1e9a 100644
--- a/var/spack/repos/builtin/packages/py-theano/package.py
+++ b/var/spack/repos/builtin/packages/py-theano/package.py
@@ -30,12 +30,13 @@ class PyTheano(PythonPackage):
     and GPUs."""
 
     homepage = "http://deeplearning.net/software/theano/"
-    url = "https://pypi.io/packages/source/T/Theano/Theano-0.8.2.tar.gz"
+    url      = "https://pypi.io/packages/source/T/Theano/Theano-0.8.2.tar.gz"
+    git      = "https://github.com/Theano/Theano.git"
 
+    version('master', branch='master')
     version('1.0.2', 'fcae24dfa76babe15f5f3c556d67c9f2')
     version('1.0.1', 'a38b36c0fdc3126c574163db0a253e69')
     version('0.8.2', 'f2d0dfe7df141115201077cd933b2c52')
-    version('master', git='https://github.com/Theano/Theano.git', branch='master')
 
     variant('gpu', default=False,
             description='Builds with support for GPUs via CUDA and cuDNN')
diff --git a/var/spack/repos/builtin/packages/py-webkit-server/package.py b/var/spack/repos/builtin/packages/py-webkit-server/package.py
index 7bf3ddde40..fa42d1b5e8 100644
--- a/var/spack/repos/builtin/packages/py-webkit-server/package.py
+++ b/var/spack/repos/builtin/packages/py-webkit-server/package.py
@@ -30,6 +30,7 @@ class PyWebkitServer(PythonPackage):
 
     homepage = "https://github.com/niklasb/webkit-server"
     url      = "https://pypi.io/packages/source/w/webkit-server/webkit-server-1.0.tar.gz"
+    git      = "https://github.com/niklasb/webkit-server.git"
 
-    version('develop', git="https://github.com/niklasb/webkit-server", branch="master")
+    version('develop', branch='master')
     version('1.0', '8463245c2b4f0264d934c0ae20bd4654')
diff --git a/var/spack/repos/builtin/packages/py-xattr/package.py b/var/spack/repos/builtin/packages/py-xattr/package.py
index 188e077811..15f4aeffd4 100644
--- a/var/spack/repos/builtin/packages/py-xattr/package.py
+++ b/var/spack/repos/builtin/packages/py-xattr/package.py
@@ -30,9 +30,9 @@ class PyXattr(PythonPackage):
         sans libattr dependency"""
 
     homepage = "http://pyxattr.k1024.org/"
+    git      = "https://github.com/fwang2/pyxattr.git"
 
-    version('develop', git='https://github.com/fwang2/pyxattr.git',
-            branch='dev')
+    version('develop', branch='dev')
 
     depends_on('python@2.7:')
     depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py
index 5c95ec621a..94b7583b8a 100644
--- a/var/spack/repos/builtin/packages/py-yt/package.py
+++ b/var/spack/repos/builtin/packages/py-yt/package.py
@@ -35,8 +35,8 @@ class PyYt(PythonPackage):
        interdisciplinary community.
     """
     homepage = "http://yt-project.org"
-    url = "https://github.com/yt-project/yt/archive/yt-3.4.0.tar.gz"
-    git = "https://github.com/yt-project/yt.git"
+    url      = "https://github.com/yt-project/yt/archive/yt-3.4.0.tar.gz"
+    git      = "https://github.com/yt-project/yt.git"
 
     version("develop", branch="master")
 
diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py
index 8003a3c0d1..4caa10f8e3 100644
--- a/var/spack/repos/builtin/packages/qmcpack/package.py
+++ b/var/spack/repos/builtin/packages/qmcpack/package.py
@@ -32,7 +32,7 @@ class Qmcpack(CMakePackage):
 
     # Package information
     homepage = "http://www.qmcpack.org/"
-    url      = "https://github.com/QMCPACK/qmcpack.git"
+    git      = "https://github.com/QMCPACK/qmcpack.git"
 
     tags = ['ecp', 'ecp-apps']
 
@@ -40,12 +40,12 @@ class Qmcpack(CMakePackage):
     # Spack manual. However, it is easier to maintain because github hashes
     # can occasionally change.
     # NOTE: 12/19/2017 QMCPACK 3.0.0 does not build properly with Spack.
-    version('3.4.0', git=url, tag='v3.4.0')
-    version('3.3.0', git=url, tag='v3.3.0')
-    version('3.2.0', git=url, tag='v3.2.0')
-    version('3.1.1', git=url, tag='v3.1.1')
-    version('3.1.0', git=url, tag='v3.1.0')
-    version('develop', git=url)
+    version('develop')
+    version('3.4.0', tag='v3.4.0')
+    version('3.3.0', tag='v3.3.0')
+    version('3.2.0', tag='v3.2.0')
+    version('3.1.1', tag='v3.1.1')
+    version('3.1.0', tag='v3.1.0')
 
     # These defaults match those in the QMCPACK manual
     variant('debug', default=False, description='Build debug version')
diff --git a/var/spack/repos/builtin/packages/qmd-progress/package.py b/var/spack/repos/builtin/packages/qmd-progress/package.py
index 3d2df5a31d..e4c05030ea 100644
--- a/var/spack/repos/builtin/packages/qmd-progress/package.py
+++ b/var/spack/repos/builtin/packages/qmd-progress/package.py
@@ -33,10 +33,11 @@ class QmdProgress(CMakePackage):
 
     homepage = "https://github.com/lanl/qmd-progress"
     url      = "https://github.com/lanl/qmd-progress/tarball/v1.1.0"
+    git      = "https://github.com/lanl/qmd-progress.git"
 
+    version('develop', branch='master')
     version('1.1.0', 'dda155134f0925629bf116e562c0a4bd')
     version('1.0.0', 'c950bead2719a47a78864e3376ba143e')
-    version('develop', git='https://github.com/lanl/qmd-progress', branch='master')
 
     variant('graphlib', default=False, description='Build with Metis Suppport')
     variant('mpi', default=True, description='Build with MPI Support')
diff --git a/var/spack/repos/builtin/packages/qtgraph/package.py b/var/spack/repos/builtin/packages/qtgraph/package.py
index d151c98076..cf8f229273 100644
--- a/var/spack/repos/builtin/packages/qtgraph/package.py
+++ b/var/spack/repos/builtin/packages/qtgraph/package.py
@@ -49,13 +49,10 @@ class Qtgraph(QMakePackage):
        libgvc within the Qt Graphics View Framework."""
 
     homepage = "https://github.com/OpenSpeedShop/QtGraph"
-    url      = "https://github.com/OpenSpeedShop/QtGraph.git"
+    git      = "https://github.com/OpenSpeedShop/QtGraph.git"
 
-    version('1.0.0.0', branch='1.0.0.0',
-            git='https://github.com/OpenSpeedShop/QtGraph.git')
-
-    version('develop', branch='master',
-            git='https://github.com/OpenSpeedShop/QtGraph.git')
+    version('develop', branch='master')
+    version('1.0.0.0', branch='1.0.0.0')
 
     # qtgraph depends on these packages
     depends_on('qt@4.8.6:', when='@develop')
diff --git a/var/spack/repos/builtin/packages/quinoa/package.py b/var/spack/repos/builtin/packages/quinoa/package.py
index 5a47d355d9..e00814950d 100644
--- a/var/spack/repos/builtin/packages/quinoa/package.py
+++ b/var/spack/repos/builtin/packages/quinoa/package.py
@@ -34,9 +34,9 @@ class Quinoa(CMakePackage):
     """
 
     homepage = "http://quinoacomputing.org"
-    url      = "https://github.com/quinoacomputing/quinoa/tarball/quinoa_v0.1"
+    git      = "https://github.com/quinoacomputing/quinoa.git"
 
-    version('develop', git='https://github.com/quinoacomputing/quinoa', branch='master')
+    version('develop', branch='master')
 
     depends_on('hdf5+mpi')
     depends_on("charm backend=mpi")