Improve recipe uniformity

94 files changed, 1246 insertions, 584 deletions

diff --git a/acstools/meta.yaml b/acstools/meta.yaml
index 04122fb..3991f08 100644
--- a/acstools/meta.yaml
+++ b/acstools/meta.yaml
@@ -3,14 +3,14 @@
 {% set number = '0' %}
 
 about:
-    home: https://github.com/spacetelescope/{{ name }}
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
     summary: For analyzing ACS data
 build:
-    number: {{ number }}
+    number: {{number}}
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
 requirements:
     build:
     - astropy >=1.1
@@ -22,8 +22,8 @@ requirements:
     - numpy
     - python x.x
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/spacetelescope/{{ name }}.git
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
 test:
     commands:
     - acs_destripe --help
diff --git a/appdirs/meta.yaml b/appdirs/meta.yaml
index 7b9769a..f9fb69d 100644
--- a/appdirs/meta.yaml
+++ b/appdirs/meta.yaml
@@ -1,21 +1,29 @@
+{% set name = 'appdirs' %}
+{% set version = '1.4.0' %}
+{% set number = '0' %}
+
 about:
-    home: http://github.com/ActiveState/appdirs
+    home: http://github.com/ActiveState/{{name}}
     license: MIT
-    summary: A small Python module for determining appropriate platform-specific dirs,
+    summary: |
+        A small Python module for determining appropriate platform-specific dirs
         e.g. a "user data dir".
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: appdirs
-    version: 1.4.0
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - setuptools
     - python x.x
     run:
     - python x.x
+
 source:
-    fn: appdirs-1.4.0.tar.gz
+    fn: {{name}-{{version}}.tar.gz
     md5: 1d17b4c9694ab84794e228f28dc3275b
-    url:
-    - https://pypi.python.org/packages/source/a/appdirs/appdirs-1.4.0.tar.gz
+    url: https://pypi.python.org/packages/source/a/{{name}}/{{name}}-{{version}}.tar.gz
diff --git a/aprio/meta.yaml b/aprio/meta.yaml
index 4b31c76..d5aa20c 100644
--- a/aprio/meta.yaml
+++ b/aprio/meta.yaml
@@ -4,14 +4,17 @@
 {% set number = '0' %}
 
 about:
-    home: http://bitbucket.org/jhunkeler/aprio
+    home: http://bitbucket.org/jhunkeler/{{name}}
     license: GPL
     summary: aprio is an automatic renice daemon.
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - python x.x
@@ -24,6 +27,7 @@ requirements:
     - python-daemon
     - docutils
     - python x.x
+
 source:
-    git_tag: {{ tag }}
-    git_url: https://bitbucket.org/jhunkeler/{{ name }}.git
+    git_tag: {{tag}}
+    git_url: https://bitbucket.org/jhunkeler/{{name}}.git
diff --git a/asdf-standard/meta.yaml b/asdf-standard/meta.yaml
index d1ae506..afa00ef 100644
--- a/asdf-standard/meta.yaml
+++ b/asdf-standard/meta.yaml
@@ -1,12 +1,20 @@
+{% set name = 'asdf-standard' %}
+{% set version = '1.0.0' %}
+{% set tag = 'v' + version %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/spacetelescope/asdf-standard
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
-    summary: asdf-standard
+    summary: Standards reference for ASDF
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: asdf-standard
-    version: 1.0.0
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - sphinx
@@ -21,6 +29,7 @@ requirements:
     - astropy >=1.1
     - setuptools
     - python x.x
+
 source:
-    git_tag: v1.0.0
-    git_url: https://github.com/spacetelescope/asdf-standard
+    git_tag: {{tag}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
diff --git a/asdf/meta.yaml b/asdf/meta.yaml
index 84d0c1e..c210ad8 100644
--- a/asdf/meta.yaml
+++ b/asdf/meta.yaml
@@ -3,14 +3,17 @@
 {% set number = '0' %}
 
 about:
-    home: https://github.com/spacetelescope/{{ name }}
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
     summary: ASDF (Advanced Scientific Data Format) is a next generation interchange format for scientific data
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
@@ -30,9 +33,11 @@ requirements:
     - setuptools
     - numpy
     - python x.x
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/spacetelescope/{{ name }}.git
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     commands:
     - asdftool --help
diff --git a/astroimtools/meta.yaml b/astroimtools/meta.yaml
index 032fd48..6abd056 100644
--- a/astroimtools/meta.yaml
+++ b/astroimtools/meta.yaml
@@ -1,13 +1,20 @@
+{% set name = 'astroimtools' %}
+{% set version = '0.1.1' %}
+{% set tag = 'v' + version %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/spacetelescope/astroimtools
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
-    readme: README.rst
-    summary: astroimtools
+    summary: Astronomical Image Tools
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: astroimtools
-    version: '0.1.1'
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
@@ -22,9 +29,11 @@ requirements:
     - matplotlib
     - numpy
     - python x.x
+
 source:
-    git_tag: v0.1.1
-    git_url: https://github.com/spacetelescope/astroimtools
+    git_tag: {{tag}}
+    git_url: https://github.com/spacetelescope/{{name}}
+
 test:
     commands:
     - imarith --help
diff --git a/astrolib.coords/meta.yaml b/astrolib.coords/meta.yaml
index 1767300..c6ef989 100644
--- a/astrolib.coords/meta.yaml
+++ b/astrolib.coords/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'astrolib.coords' %}
+{% set version = '0.39.6' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/spacetelescope/astrolib.coords.git
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
-    summary: astrolib.coords
+    summary: Astronomical coordinates & angular separations
+
 package:
-    name: astrolib.coords
-    version: 0.39.6
+    name: {{name}}
+    version: {{version}}
+
 build:
-    number: '0'
+    number: {{number}}
+
 requirements:
     build:
     - d2to1
@@ -17,9 +24,11 @@ requirements:
     run:
     - numpy
     - python x.x
+
 source:
-    git_tag: 0.39.6
-    git_url: https://github.com/spacetelescope/astrolib.coords.git/
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - astrolib.coords
diff --git a/astroquery/meta.yaml b/astroquery/meta.yaml
index 6aed835..b0b9fb7 100644
--- a/astroquery/meta.yaml
+++ b/astroquery/meta.yaml
@@ -3,21 +3,21 @@
 {% set number = '0' %}
 
 about:
-    home: https://github.com/spacetelescope/{{ name }}
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
     summary: Astroquery is a set of tools for querying astronomical web forms and databases.
 
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
 
 source:
-  fn: astroquery-{{version}}.tar.gz
-  url: https://pypi.io/packages/source/a/astroquery/astroquery-{{version}}.tar.gz
+  fn: {{name}}-{{version}}.tar.gz
+  url: https://pypi.io/packages/source/a/{{name}}/{{name}}-{{version}}.tar.gz
   md5: 1be83c630fcb462a711eb9c2eda0fbea
 
 build:
-    number: {{ number }}
+    number: {{number}}
 
 requirements:
     build:
diff --git a/asv/meta.yaml b/asv/meta.yaml
index bcf4faa..1e35471 100644
--- a/asv/meta.yaml
+++ b/asv/meta.yaml
@@ -1,12 +1,21 @@
+{% set name = 'asv' %}
+{% set version = '0.1.1' %}
+{% set tag = 'v' + version %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/spacetelescope/asv
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
-    summary: asv
+    summary: |
+        A simple Python history benchmarking tool
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: asv
-    version: 0.1.1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - six
@@ -19,6 +28,7 @@ requirements:
     - sphinx
     - numpy
     - python x.x
+
 source:
-    git_tag: v0.1.1
-    git_url: https://github.com/spacetelescope/asv
+    git_tag: {{tag}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
diff --git a/atlas-generic/meta.yaml b/atlas-generic/meta.yaml
index 5339ba0..5d321ed 100644
--- a/atlas-generic/meta.yaml
+++ b/atlas-generic/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'atlas-generic' %}
+{% set version = '3.10.2' %}
+{% set number = '0' %}
+
 about:
     home: http://sourceforge.net/projects/math-atlas/files/Stable
     license: BSD
-    summary: atlas-generic
+    summary: Automatically Tuned Linear Algebra Software
+
 build:
-    number: '1'
+    number: {{number}}
+
 package:
-    name: atlas-generic
-    version: 3.10.2
+    name: {{name}}
+    version: {{version}}
+
 source:
     fn: atlas3.10.2.tar.bz2
     url:
diff --git a/calcos/meta.yaml b/calcos/meta.yaml
index b996787..a89c8be 100644
--- a/calcos/meta.yaml
+++ b/calcos/meta.yaml
@@ -3,13 +3,16 @@
 {% set number = '1' %}
 
 about:
-    home: https://github.com/spacetelescope/{{ name }}
+    home: https://github.com/spacetelescope/{{name}}
     summary: Calibration for HST/COS
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -26,9 +29,11 @@ requirements:
     - stsci.tools
     - numpy
     - python x.x
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/spacetelescope/{{ name }}.git
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     commands:
     - calcos -r
diff --git a/cbc_test_package/meta.yaml b/cbc_test_package/meta.yaml
index a88fbf6..c43c3e2 100644
--- a/cbc_test_package/meta.yaml
+++ b/cbc_test_package/meta.yaml
@@ -2,21 +2,25 @@ about:
     home: http://example.com/cbc_test_package
     license: GPL
     summary: cbc_test_package is a test package
+
 build:
     number: '0'
+
 package:
     name: cbc_test_package
     version: 1.0.0
+
 requirements:
     build:
     - setuptools
     - python x.x
     run:
     - python x.x
+
 source:
     fn: cbc_test_package-1.0.0.tar.gz
-    url:
-    - https://bitbucket.org/jhunkeler/cbc-recipes/downloads/cbc_test_package-1.0.0.tar.gz
+    url: https://bitbucket.org/jhunkeler/cbc-recipes/downloads/cbc_test_package-1.0.0.tar.gz
+
 test:
     imports:
     - cbc_test_package
diff --git a/cfitsio/meta.yaml b/cfitsio/meta.yaml
index 8ce84a4..72b333d 100644
--- a/cfitsio/meta.yaml
+++ b/cfitsio/meta.yaml
@@ -1,13 +1,22 @@
+{% set name = 'cfitsio' %}
+{% set version = '3.370' %}
+{% set version_short = '3370' %}
+{% set number = '1' %}
+
 about:
     home: http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html
     license: BSD-like
-    summary: cfitsio
+    summary: CFITSIO is a library of C and Fortran subroutines for reading and
+            writing data files in FITS (Flexible Image Transport System)
+            data format
+
 build:
-    number: '1'
+    number: {{number}}
+
 package:
-    name: cfitsio
-    version: '3.370'
+    name: {{name}}
+    version: {{version}}
+
 source:
-    fn: cfitsio3370.tar.gz
-    url:
-    - ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3370.tar.gz
+    fn: {{name}}{{version_short}}.tar.gz
+    url: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/{{name}}{{version_short}}.tar.gz
diff --git a/costools/meta.yaml b/costools/meta.yaml
index 3192a4d..ccad48c 100644
--- a/costools/meta.yaml
+++ b/costools/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'costools' %}
+{% set version = '1.2.1' %}
+{% set number = '0' %}
+
 about:
-    home: http://www.stsci.edu/institute/software_hardware
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
-    summary: costools
+    summary: Tools for COS (Cosmic Origins Spectrograph)
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: costools
-    version: 1.2.1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -24,9 +31,11 @@ requirements:
     - setuptools
     - numpy
     - python x.x
+
 source:
-    git_tag: 1.2.1
-    git_url: https://github.com/spacetelescope/costools
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     commands:
     - timefilter --help
diff --git a/crds/meta.yaml b/crds/meta.yaml
index 1d6183a..9b16939 100644
--- a/crds/meta.yaml
+++ b/crds/meta.yaml
@@ -5,13 +5,18 @@
 about:
     home: http://www.stsci.edu/hst/observatory/crds/
     license: AURA
-    summary: CRDS assigns calibration references to data using formal rules represented in simple text files
+    summary: |
+        CRDS assigns calibration references to data using formal rules
+        represented in simple text files
+
 build:
-    number: {{ number }}
+    number: {{number}}
     preserve_egg_dir: 'no'
+
 package:
-    name: crds
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -23,9 +28,11 @@ requirements:
     - astropy >=1.1
     - numpy
     - python x.x
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/spacetelescope/{{ name }}.git
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - crds
diff --git a/d2to1/meta.yaml b/d2to1/meta.yaml
index ea70912..81c6579 100644
--- a/d2to1/meta.yaml
+++ b/d2to1/meta.yaml
@@ -1,12 +1,21 @@
+{% set name = 'd2to1' %}
+{% set version = '0.2.12' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/embray/d2to1
+    home: https://github.com/embray/{{name}}
     license: GPL
-    summary: d2to1
+    summary: |
+        Allows using distutils2-like setup.cfg files for a package's metadata
+        with a distribute/setuptools setup.py
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: d2to1
-    version: 0.2.12
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - setuptools
@@ -14,6 +23,7 @@ requirements:
     run:
     - setuptools
     - python x.x
+
 source:
-    git_tag: 0.2.12
-    git_url: https://github.com/embray/d2to1
+    git_tag: {{version}}
+    git_url: https://github.com/embray/{{name}}.git
diff --git a/drizzle/meta.yaml b/drizzle/meta.yaml
index 574d6be..8827bf4 100644
--- a/drizzle/meta.yaml
+++ b/drizzle/meta.yaml
@@ -4,20 +4,20 @@
 {% set number = '0' %}
 
 about:
-    home: https://github.com/spacetelescope/{{ name }}
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
     summary: A package for combining dithered images into a single image
 
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
 
 build:
-    number: {{ number }}
+    number: {{number}}
 
 source:
-    git_tag: {{ tag }}
-    git_url: https://github.com/spacetelescope/{{ name }}.git
+    git_tag: {{tag}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
 
 requirements:
     build:
diff --git a/drizzlepac/meta.yaml b/drizzlepac/meta.yaml
index b5f7721..d743f90 100644
--- a/drizzlepac/meta.yaml
+++ b/drizzlepac/meta.yaml
@@ -3,14 +3,17 @@
 {% set number = '0' %}
 
 about:
-    home: https://github.com/spacetelescope/drizzlepac
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
     summary: AstroDrizzle for HST images
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
@@ -49,9 +52,11 @@ requirements:
     - pyregion
     - setuptools
     - python x.x
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/spacetelescope/drizzlepac.git
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - drizzlepac
diff --git a/ds9/meta.yaml b/ds9/meta.yaml
index dd4f05f..b4d3e3e 100644
--- a/ds9/meta.yaml
+++ b/ds9/meta.yaml
@@ -1,16 +1,24 @@
+{% set name = 'ds9' %}
+{% set version = '7.4' %}
+{% set number = '0' %}
+
 about:
     home: http://ds9.si.edu/download/source/
     license: GPL,LGPL,BSD
-    summary: ds9
+    summary: |
+        SAOImage DS9 is an astronomical imaging and data visualization application
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: ds9
-    version: '7.4'
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - gcc >=4.6 [osx]
+
 source:
-    fn: ds9.7.4.tar.gz
-    url:
-    - http://ds9.si.edu/download/source//ds9.7.4.tar.gz
+    fn: {{name}}.{{version}}.tar.gz
+    url: http://ds9.si.edu/download/source/{{name}}.{{version}}.tar.gz
diff --git a/ext_shmht/meta.yaml b/ext_shmht/meta.yaml
index 3c42c27..2a735b9 100644
--- a/ext_shmht/meta.yaml
+++ b/ext_shmht/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'ext_shmht' %}
+{% set version = '0.1' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/stsci-ssb/ext_shmht
+    home: https://github.com/stsci-ssb/{{name}}
     license: BSD
-    summary: ext_shmht
+    summary: Shared memory extension
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: ext_shmht
-    version: '0.1'
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - setuptools
@@ -14,8 +21,10 @@ requirements:
     run:
     - six
     - python x.x
+
 source:
-    git_url: https://github.com/stsci-ssb/ext_shmht
+    git_url: https://github.com/stsci-ssb/{{name}}.git
+
 test:
     imports:
     - ext_shmht
diff --git a/fftw/meta.yaml b/fftw/meta.yaml
index f6d08e9..c6ea925 100644
--- a/fftw/meta.yaml
+++ b/fftw/meta.yaml
@@ -1,18 +1,26 @@
+{% set name = 'fftw' %}
+{% set version = '3.3.4' %}
+{% set number = '0' %}
+
 about:
     home: http://www.fftw.org
     license: GPL
-    summary: fftw
+    summary: |
+        A fast, free C FFT library; includes real-complex, multidimensional, and parallel transforms
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: fftw
-    version: 3.3.4
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - pkgconfig
     run:
     - pkgconfig
+
 source:
-    fn: fftw-3.3.4.tar.gz
-    url:
-    - http://www.fftw.org/fftw-3.3.4.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
+    url: http://www.fftw.org/{{name}}-{{version}}.tar.gz
diff --git a/fitsblender/meta.yaml b/fitsblender/meta.yaml
index 66e87c9..2654e83 100644
--- a/fitsblender/meta.yaml
+++ b/fitsblender/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'fitsblender' %}
+{% set version = '0.2.6' %}
+{% set number = '0' %}
+
 about:
-    home: http://github.com/spacetelescope/fitsblender
+    home: http://github.com/spacetelescope/{{name}}
     license: BSD
-    summary: fitsblender
+    summary: Aggregate values in FITS headers
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: fitsblender
-    version: 0.2.6
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
@@ -21,9 +28,11 @@ requirements:
     - stsci.tools
     - numpy
     - python x.x
+
 source:
-    git_tag: 0.2.6
-    git_url: https://github.com/spacetelescope/fitsblender
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - fitsblender
diff --git a/gcc/meta.yaml b/gcc/meta.yaml
index 5323391..24e335e 100644
--- a/gcc/meta.yaml
+++ b/gcc/meta.yaml
@@ -1,11 +1,18 @@
+{% set name = 'gcc' %}
+{% set version = '4.6.4' %}
+{% set number = '0' %}
+
 about:
-    home: http://www.netgull.com/gcc/releases/gcc-4.6.4
-    summary: gcc
+    home: http://www.netgull.com/gcc/releases/{{name}}-{{version}}
+    summary: Gnu Compiler Collection
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: gcc
-    version: 4.6.4
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - gmp >=4.3.2
@@ -17,7 +24,7 @@ requirements:
     - mpfr >=2.3.1
     - mpc >=0.8.1
     - ppl >=0.11,<1
+
 source:
-    fn: gcc-4.6.4.tar.gz
-    url:
-    - http://www.netgull.com/gcc/releases/gcc-4.6.4/gcc-4.6.4.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
+    url: http://www.netgull.com/gcc/releases/{{name}}-{{version}}/{{name}}-{{version}}.tar.gz
diff --git a/ginga/meta.yaml b/ginga/meta.yaml
index c3293b2..c7dd4c2 100644
--- a/ginga/meta.yaml
+++ b/ginga/meta.yaml
@@ -1,15 +1,20 @@
 {% set name = 'ginga' %}
-{% set version = 'v2.6.0' %}
+{% set version = '2.6.0' %}
+{% set tag = 'v' + version %}
 {% set number = '0' %}
+
 about:
     home: https://github.com/ejeschke/{{ name }}
     license: BSD
     summary: Astronomical data visualization
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.2
@@ -20,9 +25,11 @@ requirements:
     - astropy >=1.2
     - numpy
     - python x.x
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/ejeschke/{{ name }}.git
+    git_tag: {{tag}}
+    git_url: https://github.com/ejeschke/{{name}}.git
+
 test:
     commands:
     - ginga --help
diff --git a/glue-vispy-viewers/meta.yaml b/glue-vispy-viewers/meta.yaml
index b2ab7d6..f768ac1 100644
--- a/glue-vispy-viewers/meta.yaml
+++ b/glue-vispy-viewers/meta.yaml
@@ -1,16 +1,18 @@
+{% set name = 'glue-vispy-viewers' %}
 {% set version = "0.6" %}
+{% set number = '0' %}
 
 package:
-  name: glue-vispy-viewers
+  name: {{name}}
   version: {{version}}
 
 source:
-  fn: glue-vispy-viewers-{{version}}.tar.gz
-  url: https://pypi.io/packages/source/g/glue-vispy-viewers/glue-vispy-viewers-{{version}}.tar.gz
+  fn: {{name}}-{{version}}.tar.gz
+  url: https://pypi.io/packages/source/g/glue-vispy-viewers/{{name}}-{{version}}.tar.gz
   md5: 07b0ec9fec510352edc617e95ee86469
 
 build:
-  number: 0
+  number: {{number}}
   script: python setup.py install --single-version-externally-managed --record record.txt
 
 requirements:
diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml
index c2099eb..ef7dd4d 100644
--- a/glueviz/meta.yaml
+++ b/glueviz/meta.yaml
@@ -1,16 +1,18 @@
-{% set version = "0.9.1" %}
+{% set name = 'glueviz' %}
+{% set version = '0.9.1' %}
+{% set number = '0' %}
 
 package:
-  name: glueviz
+  name: {{name}}
   version: {{version}}
 
 source:
-  fn: glueviz-{{version}}.tar.gz
-  url: https://pypi.io/packages/source/g/glueviz/glueviz-{{version}}.tar.gz
+  fn: {{name}}-{{version}}.tar.gz
+  url: https://pypi.io/packages/source/g/{{name}}/{{name}}-{{version}}.tar.gz
   md5: 365887017580e243fb008d8109f2bc16
 
 build:
-  number: 0
+  number: {{number}}
   script: python setup.py install --single-version-externally-managed --record record.txt
   osx_is_app: True
 
diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml
index 168098f..31fe8a8 100644
--- a/gwcs/meta.yaml
+++ b/gwcs/meta.yaml
@@ -1,12 +1,20 @@
+{% set name = 'gwcs' %}
+{% set version = '0.6rc1' %}
+{% set tag = 'v' + version %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/spacetelescope/gwcs
+    home: https://github.com/spacetelescope/{{name}}
     license: GPL
-    summary: gwcs
+    summary: Generalized World Coordinate System
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: gwcs
-    version: 0.6rc1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - asdf
@@ -19,9 +27,11 @@ requirements:
     - astropy >=1.1
     - numpy
     - python x.x
+
 source:
-    git_tag: v0.6rc1
-    git_url: https://github.com/spacetelescope/gwcs
+    git_tag: {{tag}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - gwcs
diff --git a/hstcal/meta.yaml b/hstcal/meta.yaml
index 41aa86c..615b182 100644
--- a/hstcal/meta.yaml
+++ b/hstcal/meta.yaml
@@ -3,19 +3,23 @@
 {% set number = '1' %}
 
 about:
-    home: https://github.com/spacetelescope/hstcal
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
     summary: Calibration for HST/WFC3, HST/ACS, and HST/STIS
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - gcc >=4.6 [osx]
     run:
     - libgcc >=4.6 [osx]
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/spacetelescope/{{ name }}.git
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
diff --git a/htc_utils/meta.yaml b/htc_utils/meta.yaml
index 599a1db..b2b97d4 100644
--- a/htc_utils/meta.yaml
+++ b/htc_utils/meta.yaml
@@ -1,13 +1,19 @@
+{% set name = 'htc_utils' %}
+{% set version = '0.1' %}
+{% set number = '0' %}
+
 about:
-    home: http://bitbucket.org/jhunkeler/htc_utils
+    home: http://bitbucket.org/jhunkeler/{{name}}
     license: GPL
-    readme: README.md
     summary: htc_utils is a homebrew set of HTCondor wrappers
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: htc_utils
-    version: '0.1'
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - argparse [py26]
@@ -16,8 +22,10 @@ requirements:
     run:
     - argparse [py26]
     - python x.x
+
 source:
-    git_url: https://bitbucket.org/jhunkeler/htc_utils
+    git_url: https://bitbucket.org/jhunkeler/{{name}}.git
+
 test:
     imports:
     - htc_utils
diff --git a/iraf/meta.yaml b/iraf/meta.yaml
index 610850e..a520b6d 100644
--- a/iraf/meta.yaml
+++ b/iraf/meta.yaml
@@ -1,16 +1,23 @@
+{% set name = 'iraf' %}
+{% set version = '2.16.1' %}
+{% set number = '1' %}
+
 about:
     home: http://iraf.noao.edu
     license: MIT
     summary: NOAO Image Reduction and Analysis Facility
+
 build:
     binary_relocation: False [osx]
     detect_binary_files_with_prefix: False [osx]
-    number: '1'
+    number: {{number}}
+
 package:
-    name: iraf
-    version: 2.16.1
+    name: {{name}}
+    version: {{version}}
+
 source:
-    fn: iraf.tar.gz
+    fn: {{name}}.tar.gz
     url:
-    - http://ssb.stsci.edu/stripped/linux/iraf.tar.gz [linux]
-    - http://ssb.stsci.edu/stripped/osx/iraf.tar.gz   [osx]
+    - http://ssb.stsci.edu/stripped/linux/{{name}}.tar.gz [linux]
+    - http://ssb.stsci.edu/stripped/osx/{{iraf}}.tar.gz   [osx]
diff --git a/jwxml/meta.yaml b/jwxml/meta.yaml
index 299bdee..2c5b8b5 100644
--- a/jwxml/meta.yaml
+++ b/jwxml/meta.yaml
@@ -1,12 +1,21 @@
+{% name = 'jwxml' %}
+{% version = '0.1.0' %}
+{% tag = 'v' + version %}
+{% number = '0' %}
+
 about:
-    home: https://github.com/mperrin/jwxml
+    home: https://github.com/mperrin/{{name}}
     license: BSD
-    summary: jwxml
+    summary: |
+        Parse and manipulate XML files, mostly JWST optics and wavefront sensing related.
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: jwxml
-    version: 0.1.0
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - numpy
@@ -16,9 +25,11 @@ requirements:
     - numpy
     - matplotlib
     - python x.x
+
 source:
-    git_tag: v0.1.0
-    git_url: https://github.com/mperrin/jwxml
+    git_tag: {{tag}}
+    git_url: https://github.com/mperrin/{{name}}.git
+
 test:
     commands:
     - python -c 'from jwxml.siaf import SIAF; SIAF(instr="NIRCam")'
diff --git a/lapack/meta.yaml b/lapack/meta.yaml
index 474460a..70528ee 100644
--- a/lapack/meta.yaml
+++ b/lapack/meta.yaml
@@ -1,16 +1,27 @@
+{% set name = 'lapack' %}
+{% set version = '3.6.0' %}
+{% set number = '0' %}
+
 about:
     home: http://www.netlib.org
     license: BSD
-    summary: lapack
+    summary: |
+        LAPACK is written in Fortran 90 and provides routines for solving
+        systems of simultaneous linear equations, least-squares solutions
+        of linear systems of equations, eigenvalue problems, and singular
+        value problems
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: lapack
-    version: 3.6.0
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - cmake
+
 source:
-    fn: lapack-3.6.0.tgz
-    url:
-    - http://www.netlib.org/lapack/lapack-3.6.0.tgz
+    fn: {{name}}-{{version}}.tgz
+    url: http://www.netlib.org/{{name}}/{{name}}-{{version}}.tgz
diff --git a/linecache2/meta.yaml b/linecache2/meta.yaml
index cd8780b..c3876d6 100644
--- a/linecache2/meta.yaml
+++ b/linecache2/meta.yaml
@@ -1,12 +1,18 @@
+{% set name = 'linecache2' %}
+{% set version = '1.0.0' %}
+{% set number = '0' %}
 about:
-    home: https://pypi.python.org/packages/source/l/linecache2
+    home: https://pypi.python.org/packages/source/l/{{name}}
     license: BSD
-    summary: linecache2
+    summary: Backports of the linecache module
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: linecache2
-    version: 1.0.0
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - pbr
@@ -15,11 +21,11 @@ requirements:
     run:
     - pbr
     - python x.x
+
 source:
-    fn: linecache2-1.0.0.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
     md5: 7b25d0289ec36bff1f9e63c4329ce65c
-    url:
-    - https://pypi.python.org/packages/source/l/linecache2/linecache2-1.0.0.tar.gz
+    url: https://pypi.python.org/packages/source/l/{{name}}/{{name}-{{version}}.tar.gz
 test:
     imports:
     - linecache2
diff --git a/mechanize/meta.yaml b/mechanize/meta.yaml
index 7758b6d..5cdcfbf 100644
--- a/mechanize/meta.yaml
+++ b/mechanize/meta.yaml
@@ -1,23 +1,32 @@
+{% set name = 'mechanize' %}
+{% set version = '0.2.5' %}
+{% set number = '0' %}
+
 about:
-    home: https://pypi.python.org/packages/source/m/mechanize
+    home: https://pypi.python.org/packages/source/m/{{name}}
     license: BSD
-    summary: mechanize
+    summary: Stateful programmatic web browsing
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: mechanize
-    version: 0.2.5
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - setuptools
     - python x.x
     run:
     - python x.x
+
 source:
-    fn: mechanize-0.2.5.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
     md5: 32657f139fc2fb75bcf193b63b8c60b2
     url:
-    - https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz
+    - https://pypi.python.org/packages/source/m/{{name}}/{{name}}-{{version}}.tar.gz
+
 test:
     imports:
     - mechanize
diff --git a/mosviz/meta.yaml b/mosviz/meta.yaml
index 9c4767f..65384c4 100644
--- a/mosviz/meta.yaml
+++ b/mosviz/meta.yaml
@@ -1,17 +1,23 @@
 {% set name = 'mosviz' %}
 {% set version = '0.0.1' %}
-{% set tag = 'v0.0.1' %}
+{% set tag = 'v' + version %}
 {% set number = '1' %}
 
+about:
+  home: https://github.com/spacetelescope/mosviz
+  license: BSD
+  summary: |
+        Quick-look analysis and visualization tool for multi-object spectroscopy
+
 package:
-  name: {{ name }}
-  version: {{ version }}
+  name: {{name}}
+  version: {{version}}
 
 build:
-  number: {{ number }}
+  number: {{number}}
 
 source:
-  git_tag: {{ tag }}
+  git_tag: {{tag}}
   git_url: https://github.com/spacetelescope/mosviz.git
 
 requirements:
@@ -38,6 +44,3 @@ test:
   imports:
     - mosviz
 
-about:
-  home: https://github.com/spacetelescope/mosviz
-  license: BSD
diff --git a/nictools/meta.yaml b/nictools/meta.yaml
index cd32cfa..9d22e55 100644
--- a/nictools/meta.yaml
+++ b/nictools/meta.yaml
@@ -1,11 +1,19 @@
+{% set name = 'nictools' %}
+{% set version = '1.1.3' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/spacetelescope/nictools
-    summary: nictools
+    home: https://github.com/spacetelescope/{{name}}
+    summary: |
+        Python tools for NICMOS data
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: nictools
-    version: 1.1.3
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
@@ -21,9 +29,11 @@ requirements:
     - scipy
     - stsci.tools
     - python x.x
+
 source:
-    git_tag: 1.1.3
-    git_url: https://github.com/spacetelescope/nictools
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - nictools
diff --git a/opuscoords/meta.yaml b/opuscoords/meta.yaml
index 283f69e..8fc9b17 100644
--- a/opuscoords/meta.yaml
+++ b/opuscoords/meta.yaml
@@ -3,14 +3,17 @@
 {% set number = '0' %}
 
 about:
-    home: https://github.com/spacetelescope/opuscoords
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
-    summary: opuscoords
+    summary: Python Tools for OPUS Coordinate Conversions
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -21,9 +24,11 @@ requirements:
     run:
     - numpy
     - python x.x
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/spacetelescope/opuscoords.git
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - opuscoords
diff --git a/pandeia-thirdparty/meta.yaml b/pandeia-thirdparty/meta.yaml
index 71fad36..52dc5ac 100644
--- a/pandeia-thirdparty/meta.yaml
+++ b/pandeia-thirdparty/meta.yaml
@@ -2,11 +2,14 @@ about:
     home: http://stsci.edu
     license: BSD
     summary: pandeia-thirdparty meta-package
+
 build:
     number: '0'
+
 package:
     name: pandeia-thirdparty
     version: 1.1.4
+
 requirements:
     build:
     - d2to1
diff --git a/pandokia/meta.yaml b/pandokia/meta.yaml
index 8595227..b2f5141 100644
--- a/pandokia/meta.yaml
+++ b/pandokia/meta.yaml
@@ -3,14 +3,17 @@
 {% set number = '1' %}
 
 about:
-    home: http://ssb.stsci.edu/testing/pandokia
+    home: http://ssb.stsci.edu/testing/{{name}}
     license: BSD
     summary: A test running/reporting facility
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - nose
@@ -23,8 +26,10 @@ requirements:
     - shunit2
     - pytest
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/pandokia.git
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     commands:
     - pdk --help
diff --git a/parsley/meta.yaml b/parsley/meta.yaml
index 522800d..bdb4c8c 100644
--- a/parsley/meta.yaml
+++ b/parsley/meta.yaml
@@ -1,23 +1,31 @@
+{% set name = 'parsely' %}
+{% set version = '1.3' %}
+{% set number = '0' %}
+
 about:
     home: https://pypi.python.org/packages/source/P/Parsley
     license: BSD
     summary: parsley
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: parsley
-    version: '1.3'
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - setuptools
     - python x.x
     run:
     - python x.x
+
 source:
-    fn: Parsley-1.3.tar.gz
+    fn: Parsley-{{version}}.tar.gz
     md5: 92bc256e5f73810a609dc7874637ad31
-    url:
-    - https://pypi.python.org/packages/source/P/Parsley/Parsley-1.3.tar.gz
+    url: https://pypi.python.org/packages/source/P/Parsley/Parsley-{{version}}.tar.gz
+
 test:
     imports:
     - parsley
diff --git a/photutils/meta.yaml b/photutils/meta.yaml
index b35f4a2..32396bb 100644
--- a/photutils/meta.yaml
+++ b/photutils/meta.yaml
@@ -1,12 +1,20 @@
+{% set name = 'photutils' %}
+{% set version = '0.3' %}
+{% set tag = 'v' + version %}
+{% set number = '1' %}
+
 about:
-    home: https://github.com/astropy/photutils
+    home: https://github.com/astropy/{{name}}
     license: BSD
-    summary: photutils
+    summary: An Astropy package for photometry
+
 build:
-    number: '1'
+    number: {{number}}
+
 package:
-    name: photutils
-    version: 0.3
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
@@ -26,9 +34,11 @@ requirements:
     - scipy
     - setuptools
     - python x.x
+
 source:
-    git_tag: v0.3
-    git_url: https://github.com/astropy/photutils
+    git_tag: {{tag}}
+    git_url: https://github.com/astropy/{{name}}.git
+
 test:
     imports:
     - photutils
diff --git a/poppy/meta.yaml b/poppy/meta.yaml
index fda7de8..a1d3a9f 100644
--- a/poppy/meta.yaml
+++ b/poppy/meta.yaml
@@ -1,12 +1,22 @@
+{% set name = 'poppy' %}
+{% set version = '0.5.1' %}
+{% set tag = 'v' + version %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/mperrin/poppy
+    home: https://github.com/mperrin/{{name}}
     license: BSD
-    summary: poppy
+    summary: |
+        Physical optics propagation (wavefront diffraction) for optical
+        simulations, particularly of telescopes
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: poppy
-    version: 0.5.1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
@@ -26,6 +36,7 @@ requirements:
     - enum34 [py27]
     - setuptools
     - python x.x
+
 source:
-    git_tag: v0.5.1
-    git_url: https://github.com/mperrin/poppy
+    git_tag: {{tag}}
+    git_url: https://github.com/mperrin/{{name}}.git
diff --git a/purge_path/meta.yaml b/purge_path/meta.yaml
index 355822b..5d77bd5 100644
--- a/purge_path/meta.yaml
+++ b/purge_path/meta.yaml
@@ -1,18 +1,26 @@
+{% set name = 'purge_path' %}
+{% set version = '1.0.0' %}
+{% set number = '0' %}
+
 about:
-    home: http://bitbucket.org/jhunkeler/purge_path
+    home: http://bitbucket.org/jhunkeler/{{name}}
     license: GPL
     summary: purge_path a small PATH manipulator
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: purge_path
-    version: 1.0.0
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - python x.x
     - setuptools
     run:
     - python x.x
+
 source:
-    git_tag: 1.0.0
-    git_url: https://bitbucket.org/jhunkeler/purge_path
+    git_tag: {{version}}
+    git_url: https://bitbucket.org/jhunkeler/{{name}}.git
diff --git a/pydrizzle/meta.yaml b/pydrizzle/meta.yaml
index 6e949cd..af7932a 100644
--- a/pydrizzle/meta.yaml
+++ b/pydrizzle/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'pydrizzle' %}
+{% set version = '6.4.4' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/spacetelescope/pydrizzle
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
     summary: Geometrically correct and combine images using Drizzle
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: pydrizzle
-    version: 6.4.4
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -22,9 +29,11 @@ requirements:
     - wxpython [py27]
     - numpy
     - python x.x
+
 source:
-    git_tag: 6.4.4
-    git_url: https://github.com/spacetelescope/pydrizzle
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - pydrizzle
diff --git a/pyds9/meta.yaml b/pyds9/meta.yaml
index aa30794..d7e2d94 100644
--- a/pyds9/meta.yaml
+++ b/pyds9/meta.yaml
@@ -1,15 +1,22 @@
+{% set name = 'pyds9' %}
+{% set version = '1.9.0.dev' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/ericmandel/pyds9
+    home: https://github.com/ericmandel/{{name}}
     license: GPL
     summary: |
         (Supervised master build)
         Python connection to SAOimage DS9 via XPA
+
 build:
-    number: '0'
-    string: {{ GIT_BUILD_STR }}
+    number: {{number}}
+    string: {{GIT_BUILD_STR}}
+
 package:
-    name: pyds9
-    version: 1.9.0.dev
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy
@@ -25,9 +32,11 @@ requirements:
     - six
     - numpy
     - python x.x
+
 source:
     git_rev: 3761d7ac151f8c8729d0fb6cdba017cadf278283
-    git_url: https://github.com/ericmandel/pyds9
+    git_url: https://github.com/ericmandel/{{name}}.git
+
 test:
     imports:
     - pyds9
diff --git a/pyfftw/meta.yaml b/pyfftw/meta.yaml
index b9d07e4..2003add 100644
--- a/pyfftw/meta.yaml
+++ b/pyfftw/meta.yaml
@@ -1,12 +1,21 @@
+{% set name = 'pyfftw' %}
+{% set version = '0.9.2' %}
+{% set number = '1' %}
+
 about:
     home: http://hgomersall.github.com/pyFFTW
     license: GPL
-    summary: pyfftw
+    summary: |
+        A pythonic wrapper around FFTW, the FFT library, presenting a unified
+        interface for all the supported transforms
+
 build:
-    number: '1'
+    number: {{number}}
+
 package:
-    name: pyfftw
-    version: 0.9.2
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - fftw
@@ -20,10 +29,11 @@ requirements:
     - fftw
     - numpy
     - python x.x
+
 source:
-    fn: pyFFTW-0.9.2.tar.gz
-    url:
-    - https://pypi.python.org/packages/source/p/pyFFTW/pyFFTW-0.9.2.tar.gz
+    fn: pyFFTW-{{version}}.tar.gz
+    url: https://pypi.python.org/packages/source/p/pyFFTW/pyFFTW-{{version}}.tar.gz
+
 test:
     imports:
     - pyfftw
diff --git a/pyobjc-core/meta.yaml b/pyobjc-core/meta.yaml
index c64ebac..ed61175 100644
--- a/pyobjc-core/meta.yaml
+++ b/pyobjc-core/meta.yaml
@@ -6,22 +6,26 @@ about:
     home: http://pyobjc.sourceforge.net/
     license: MIT
     summary: Python<->ObjC Interoperability Module
+
 build:
     number: {{ number }}
     preserve_egg_dir: 'true'
+
 package:
     name: {{ name }}
     version: {{ version }}
+
 requirements:
     build:
     - setuptools
     - python x.x
     run:
     - python x.x
+
 source:
     fn: pyobjc-{{ version }}.tar.gz
-    url:
-    - https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-{{ version }}.tar.bz2
+    url: https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-{{ version }}.tar.bz2
+
 test:
     imports:
     - PyObjCTools
diff --git a/pyobjc-framework-cocoa/meta.yaml b/pyobjc-framework-cocoa/meta.yaml
index d257ff9..2d9dff8 100644
--- a/pyobjc-framework-cocoa/meta.yaml
+++ b/pyobjc-framework-cocoa/meta.yaml
@@ -8,23 +8,26 @@ about:
     summary: Wrappers for the Cocoa frameworks on Mac OS X
 
 build:
-    number: {{ number }}
+    number: {{number}}
     preserve_egg_dir: 'true'
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
-    - pyobjc-core =={{ version }}
+    - pyobjc-core =={{version}}
     - setuptools
     - python x.x
     run:
     - pyobjc-core
     - python x.x
+
 source:
-    fn: pyobjc-{{ version }}.tar.gz
-    url:
-    - https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-{{ version }}.tar.bz2
+    fn: pyobjc-{{version}}.tar.gz
+    url: https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-{{version}}.tar.bz2
+
 test:
     imports:
     - Cocoa
diff --git a/pyobjc-framework-quartz/meta.yaml b/pyobjc-framework-quartz/meta.yaml
index 01c111f..426bbde 100644
--- a/pyobjc-framework-quartz/meta.yaml
+++ b/pyobjc-framework-quartz/meta.yaml
@@ -6,25 +6,29 @@ about:
     home: http://pyobjc.sourceforge.net/
     license: MIT
     summary: Wrappers for the Quartz frameworks on Mac OS X
+
 build:
-    number: {{ number }}
+    number: {{number}}
     preserve_egg_dir: 'true'
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
-    - pyobjc-core =={{ version }}
-    - pyobjc-framework-cocoa =={{ version }}
+    - pyobjc-core =={{version }}
+    - pyobjc-framework-cocoa =={{version}}
     - setuptools
     - python x.x
     run:
-    - pyobjc-core =={{ version }}
-    - pyobjc-framework-cocoa =={{ version }}
+    - pyobjc-core =={{version}}
+    - pyobjc-framework-cocoa =={{version}}
     - python x.x
+
 source:
-    fn: pyobjc-{{ version }}.tar.gz
-    url:
-    - https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-{{ version }}.tar.bz2
+    fn: pyobjc-{{version}}.tar.gz
+    url: https://bitbucket.org/ronaldoussoren/pyobjc/get/pyobjc-{{version}}.tar.bz2
+
 #test:
     # - see runtest.py
diff --git a/pyqtgraph/meta.yaml b/pyqtgraph/meta.yaml
index 57050ac..2700e2f 100644
--- a/pyqtgraph/meta.yaml
+++ b/pyqtgraph/meta.yaml
@@ -1,14 +1,20 @@
+{% set name = 'pyqtgraph' %}
+{% set version = '0.9.11' %}
+{% set number = '1' %}
+
 about:
     home: http://www.pyqtgraph.org/
     license: MIT
-    summary: A pure-Python graphics library for PyQt/PySide (git master build)
+    summary: |
+        (Supervised master build)
+        A pure-Python graphics library for PyQt/PySide
 
 build:
-    number: '1'
+    number: {{number}}
 
 package:
-    name: pyqtgraph
-    version: 0.9.11
+    name: {{name}}
+    version: {{version}}
 
 requirements:
     build:
@@ -23,7 +29,7 @@ requirements:
 
 source:
     git_rev: 670d63cd
-    git_url: https://github.com/pyqtgraph/pyqtgraph.git
+    git_url: https://github.com/pyqtgraph/{{name}}.git
 
 test:
   imports:
diff --git a/pyraf/meta.yaml b/pyraf/meta.yaml
index 706a10f..a323052 100644
--- a/pyraf/meta.yaml
+++ b/pyraf/meta.yaml
@@ -3,14 +3,18 @@
 {% set number = '0' %}
 
 about:
-    home: https://github.com/spacetelescope/pyraf
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
-    summary: pyraf
+    summary: |
+        Provides a Pythonic interface to IRAF
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -34,9 +38,11 @@ requirements:
     - stsci.tools
     - numpy
     - python x.x
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/spacetelescope/pyraf
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     commands:
     - pyraf --help
diff --git a/pyregion/meta.yaml b/pyregion/meta.yaml
index 14db09b..7b6f2c9 100644
--- a/pyregion/meta.yaml
+++ b/pyregion/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'pyregion' %}
+{% set version = '1.1.2' %}
+{% set number = '0' %}
+
 about:
-    home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
-    summary: pyregion
+    summary: Python parser for ds9 region files
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: pyregion
-    version: 1.1.2
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -19,8 +26,11 @@ requirements:
     - pyparsing
     - setuptools
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/pyregion
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - pyregion
diff --git a/python-daemon/meta.yaml b/python-daemon/meta.yaml
index a508a74..884191f 100644
--- a/python-daemon/meta.yaml
+++ b/python-daemon/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'python-daemon' %}
+{% set version = '2.0.5' %}
+{% set number = '0' %}
+
 about:
-    home: http://bitbucket.org/jhunkeler/python-daemon
+    home: https://pagure.io/{{name}}
     license: Apache-2
     summary: Library to implement a well-behaved Unix daemon process.
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: python-daemon
-    version: 2.0.5
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - docutils
@@ -15,8 +22,8 @@ requirements:
     run:
     - lockfile
     - python x.x
+
 source:
-    fn: python-daemon-2.0.5.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
     md5: 73e7f49f525c51fa4a995aea4d80de41
-    url:
-    - https://pypi.python.org/packages/source/p/python-daemon/python-daemon-2.0.5.tar.gz
+    url: https://pypi.python.org/packages/source/p/{{name}}/{{name}}-{{version}}.tar.gz
diff --git a/pytools/meta.yaml b/pytools/meta.yaml
index 87e3cdb..0aa6b7e 100644
--- a/pytools/meta.yaml
+++ b/pytools/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'pytools' %}
+{% set version = '2016.1' %}
+{% set number = '1' %}
+
 about:
-    home: https://pypi.python.org/pytools
+    home: https://pypi.python.org/{{name}}
     license: MIT
     summary: A collection of tools for Python
+
 build:
-    number: '1'
+    number: {{number}}
+
 package:
-    name: pytools
-    version: '2016.1'
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - decorator >=3.2.0
@@ -21,11 +28,13 @@ requirements:
     - six >=1.8.0
     - numpy
     - python x.x
+
 source:
-    fn: pytools-2016.1.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
     md5: d8af5c5bea24aa4a21881684dcf03b06
     url:
-    - https://pypi.python.org/packages/source/p/pytools/pytools-2016.1.tar.gz
+    - https://pypi.python.org/packages/source/p/{{name}}/{{name}}-{{version}}.tar.gz
+
 test:
     imports:
     - pytools
diff --git a/pywcs/meta.yaml b/pywcs/meta.yaml
index 75936b8..4f00f64 100644
--- a/pywcs/meta.yaml
+++ b/pywcs/meta.yaml
@@ -1,12 +1,20 @@
+{% set name = 'pywcs' %}
+{% set version = '1.12.1' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/spacetelescope/pywcs
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
-    summary: pywcs
+    summary: |
+        Python wrappers to WCSLIB
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: pywcs
-    version: 1.12.1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -19,8 +27,10 @@ requirements:
     - stsci.tools
     - numpy
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/pywcs
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - pywcs
diff --git a/qtpy/meta.yaml b/qtpy/meta.yaml
index c9b4668..1973809 100644
--- a/qtpy/meta.yaml
+++ b/qtpy/meta.yaml
@@ -1,16 +1,18 @@
-{% set version = "1.1.1" %}
+{% set name = 'qtpy' %}
+{% set version = '1.1.1' %}
+{% set number = '0' %}
 
 package:
-  name: qtpy
+  name: {{name}}
   version: {{version}}
 
 source:
-  fn: qtpy-{{version}}.tar.gz
-  url: https://pypi.io/packages/source/q/qtpy/QtPy-{{version}}.tar.gz
+  fn: {{name}}-{{version}}.tar.gz
+  url: https://pypi.io/packages/source/q/{{name}}/QtPy-{{version}}.tar.gz
   md5: 181a1cc9c010e0c1f4daa3f0f69e3782
 
 build:
-  number: 0
+  number: {{number}}
   script: python setup.py install --single-version-externally-managed --record record.txt
 
 requirements:
diff --git a/reftools/meta.yaml b/reftools/meta.yaml
index a35d935..1a54a50 100644
--- a/reftools/meta.yaml
+++ b/reftools/meta.yaml
@@ -3,14 +3,17 @@
 {% set number = '0' %}
 
 about:
-    home: https://github.com/spacetelescope/{{ name }}
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
     summary: For HST reference files
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
@@ -21,9 +24,11 @@ requirements:
     - astropy >=1.1
     - numpy
     - python x.x
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/spacetelescope/{{ name }}.git
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     commands:
     - tdspysyn --help
diff --git a/relic/meta.yaml b/relic/meta.yaml
index f8a7fc3..cd71e8a 100644
--- a/relic/meta.yaml
+++ b/relic/meta.yaml
@@ -3,23 +3,28 @@
 {% set number = '0' %}
 
 about:
-    home: http://github.com/jhunkeler/relic
+    home: http://github.com/jhunkeler/{{name}}
     license: BSD
     summary: Release I Control, for git
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - setuptools
     - python x.x
     run:
     - python x.x
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/jhunkeler/relic.git
+    git_tag: {{version}}
+    git_url: https://github.com/jhunkeler/{{name}}.git
+
 test:
     imports:
     - relic
diff --git a/selenium/meta.yaml b/selenium/meta.yaml
index e3e25dd..5fc2e9d 100644
--- a/selenium/meta.yaml
+++ b/selenium/meta.yaml
@@ -1,23 +1,30 @@
+{% set name = 'selenium' %}
+{% set version = '2.49.2' %}
+{% set number = '0' %}
+
 about:
-    home: https://pypi.python.org/packages/source/s/selenium
+    home: https://pypi.python.org/packages/source/s/{{name}}
     license: BSD
-    summary: selenium
+    summary: Python bindings for Selenium
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: selenium
-    version: 2.49.2
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - setuptools
     - python x.x
     run:
     - python x.x
+
 source:
-    fn: selenium-2.49.2.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
     md5: 17cfe7c6adb2cad1f64a61cf753f0738
-    url:
-    - https://pypi.python.org/packages/source/s/selenium/selenium-2.49.2.tar.gz
+    url: https://pypi.python.org/packages/source/s/{{name}}/{{name}}-{{version}}.tar.gz
 test:
     imports:
     - selenium
diff --git a/sextractor-generic/meta.yaml b/sextractor-generic/meta.yaml
index 3340429..91deed2 100644
--- a/sextractor-generic/meta.yaml
+++ b/sextractor-generic/meta.yaml
@@ -1,12 +1,19 @@
+{% name = 'sextractor-generic' %}
+{% version = '2.19.5' %}
+{% number = '0' %}
+
 about:
     home: http://www.astromatic.net/download/sextractor
     license: GPL
-    summary: sextractor-generic
+    summary: Generic (unoptimized) Source Extractor
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: sextractor-generic
-    version: 2.19.5
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - fftw
@@ -15,7 +22,7 @@ requirements:
     run:
     - fftw
     - atlas-generic [osx]
+
 source:
-    fn: sextractor-2.19.5.tar.gz
-    url:
-    - http://www.astromatic.net/download/sextractor/sextractor-2.19.5.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
+    url: http://www.astromatic.net/download/{{name}}/{{name}}-{{version}}.tar.gz
diff --git a/sextractor/meta.yaml b/sextractor/meta.yaml
index be6184a..058f31e 100644
--- a/sextractor/meta.yaml
+++ b/sextractor/meta.yaml
@@ -1,13 +1,20 @@
+{% set name = 'sextractor' %}
+{% set version = '2.19.5' %}
+
 about:
-    home: http://www.astromatic.net/download/sextractor
+    home: http://www.astromatic.net/download/{{name}}
     license: GPL
-    summary: sextractor
+    summary: |
+        SExtractor is a program that builds a catalogue of objects from an astronomical image
+
 build:
     number: '1' [linux]
     number: '0' [osx]
+
 package:
-    name: sextractor
-    version: 2.19.5
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - atlas-generic [linux]
@@ -18,7 +25,7 @@ requirements:
     run:
     - atlas-generic [linux]
     - fftw
+
 source:
-    fn: sextractor-2.19.5.tar.gz
-    url:
-    - http://www.astromatic.net/download/sextractor/sextractor-2.19.5.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
+    url: http://www.astromatic.net/download/sextractor/{{name}}-{{version}}.tar.gz
diff --git a/shunit2/meta.yaml b/shunit2/meta.yaml
index 8688806..671c4a3 100644
--- a/shunit2/meta.yaml
+++ b/shunit2/meta.yaml
@@ -1,16 +1,26 @@
+{% set name = 'shunit2' %}
+{% set version = '2.0.3' %}
+{% set number = '0' %}
+
 about:
-    home: http://sourceforge.net/projects/shunit2
+    home: http://sourceforge.net/projects/{{version}}
     license: LGPL
-    summary: shunit2
+    summary: |
+        shUnit2 is a xUnit unit test framework for Bourne based shell
+        scripts, and it is designed to work in a similar manner to JUnit,
+        PyUnit, etc
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: shunit2
-    version: 2.0.3
+    name: {{name}}
+    version: {{version}}
+
 source:
-    fn: shunit2-2.0.3.tgz
-    url:
-    - https://downloads.sourceforge.net/shunit2/shunit2-2.0.3.tgz
+    fn: {{name}}-{{version}}.tgz
+    url: https://downloads.sourceforge.net/{{name}}/{{name}}-{{version}}.tgz
+
 test:
     commands:
     - shunit2 --help
diff --git a/specutils/meta.yaml b/specutils/meta.yaml
index 15f4dbe..2d03821 100644
--- a/specutils/meta.yaml
+++ b/specutils/meta.yaml
@@ -9,16 +9,15 @@ about:
     summary: One-dimensional spectral operations
 
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
 
 build:
-    # Define this value above
-    number: {{ number }}
+    number: {{number}}
 
 source:
-    git_tag: {{ tag }}
-    git_url: https://github.com/astropy/{{ name }}.git
+    git_tag: {{tag}}
+    git_url: https://github.com/astropy/{{name}}.git
 
 requirements:
     build:
diff --git a/sphere/meta.yaml b/sphere/meta.yaml
index 45944dc..40b9528 100644
--- a/sphere/meta.yaml
+++ b/sphere/meta.yaml
@@ -3,14 +3,17 @@
 {% set number = '0' %}
 
 about:
-    home: https://github.com/spacetelescope/sphere
+    home: https://github.com/spacetelescope/{{sphere}}
     license: BSD
-    summary: For handling spherical polygons that represent arbitrary regions of the sky 
+    summary: For handling spherical polygons that represent arbitrary regions of the sky
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
@@ -23,9 +26,11 @@ requirements:
     - matplotlib
     - numpy
     - python x.x
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/spacetelescope/sphere
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - spherical_geometry
diff --git a/sphinx_rtd_theme/meta.yaml b/sphinx_rtd_theme/meta.yaml
index 556a107..5c8f8b4 100644
--- a/sphinx_rtd_theme/meta.yaml
+++ b/sphinx_rtd_theme/meta.yaml
@@ -1,12 +1,20 @@
+{% set name = 'sphinx_rtd_theme' %}
+{% set version = '0.1.9' %}
+{% set number = '0' %}
+
 about:
-    home: https://pypi.python.org/packages/source/s/sphinx_rtd_theme
+    home: https://pypi.python.org/packages/source/s/{{name}}
     license: BSD
-    summary: sphinx_rtd_theme
+    summary: |
+        ReadTheDocs.org theme for Sphinx, 2013 version
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: sphinx_rtd_theme
-    version: 0.1.9
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - sphinx
@@ -15,11 +23,12 @@ requirements:
     run:
     - sphinx
     - python x.x
+
 source:
-    fn: sphinx_rtd_theme-0.1.9.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
     md5: 86a25c8d47147c872e42dc84cc66f97b
-    url:
-    - https://pypi.python.org/packages/source/s/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.tar.gz
+    url: https://pypi.python.org/packages/source/s/{{name}}/{{name}}-{{version}}.tar.gz
+
 test:
     imports:
     - sphinx_rtd_theme
diff --git a/sphinxcontrib-programoutput/meta.yaml b/sphinxcontrib-programoutput/meta.yaml
index d8929e1..cdb223d 100644
--- a/sphinxcontrib-programoutput/meta.yaml
+++ b/sphinxcontrib-programoutput/meta.yaml
@@ -1,12 +1,20 @@
+{% set name = 'sphinxcontrib-programoutput' %}
+{% set version = '0.8' %}
+{% set number = '0' %}
+
 about:
-    home: https://pypi.python.org/packages/source/s/sphinxcontrib-programoutput
+    home: https://pypi.python.org/packages/source/s/{{name}}
     license: BSD
-    summary: sphinxcontrib-programoutput
+    summary: |
+        Sphinx extension to include program output
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: sphinxcontrib-programoutput
-    version: '0.8'
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - sphinx
@@ -15,8 +23,8 @@ requirements:
     run:
     - sphinx
     - python x.x
+
 source:
-    fn: sphinxcontrib-programoutput-0.8.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
     md5: bb0be17ef13f268378b2af51ff413c58
-    url:
-    - https://pypi.python.org/packages/source/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.tar.gz
+    url: https://pypi.python.org/packages/source/s/{{name}}/{{name}}-{{version}}.tar.gz
diff --git a/stginga/meta.yaml b/stginga/meta.yaml
index 12dd044..be7af64 100644
--- a/stginga/meta.yaml
+++ b/stginga/meta.yaml
@@ -4,14 +4,17 @@
 {% set number = '0' %}
 
 about:
-    home: https://github.com/spacetelescope/{{ name }}
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
     summary: Ginga products specific to STScI data analysis
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - ginga
@@ -26,9 +29,11 @@ requirements:
     - numpy
     - scipy
     - python x.x
+
 source:
-    git_tag: {{ tag }}
-    git_url: https://github.com/spacetelescope/{{ name }}.git
+    git_tag: {{tag}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - stginga
diff --git a/stistools/meta.yaml b/stistools/meta.yaml
index c5ac53a..c75015b 100644
--- a/stistools/meta.yaml
+++ b/stistools/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'stistools' %}
+{% set version = '1.1' %}
+{% set number = '0' %}
+
 about:
-    home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
-    summary: stistools
+    summary: Tools for STIS (Space Telescope Imaging Spectrograph)
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: stistools
-    version: '1.1'
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -23,8 +30,10 @@ requirements:
     - stsci.tools
     - numpy
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/stistools
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - stistools
diff --git a/stsci-data-analysis/meta.yaml b/stsci-data-analysis/meta.yaml
index 769b0a3..20b7c9a 100644
--- a/stsci-data-analysis/meta.yaml
+++ b/stsci-data-analysis/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'stsci-data-analysis' %}
+{% set version = '1.1.1' %}
+{% set number = '0' %}
+
 about:
-    home: http://stsci.edu
+    home: http://ssb.stsci.edu
     license: BSD
     summary: stsci-data-analysis meta-package
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: stsci-data-analysis
-    version: 1.1.1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
diff --git a/stsci-hst/meta.yaml b/stsci-hst/meta.yaml
index 2649390..276db89 100644
--- a/stsci-hst/meta.yaml
+++ b/stsci-hst/meta.yaml
@@ -1,12 +1,19 @@
+{% name = 'stsci-hst' %}
+{% version = '1.0.4' %}
+{% number = '0' %}
+
 about:
-    home: http://www.stsci.edu
+    home: http://ssb.stsci.edu
     license: BSD
     summary: stsci-hst meta-package
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: stsci-hst
-    version: 1.0.4
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - purge_path >=1.0.0
diff --git a/stsci.convolve/meta.yaml b/stsci.convolve/meta.yaml
index 30942d8..0ae3c2a 100644
--- a/stsci.convolve/meta.yaml
+++ b/stsci.convolve/meta.yaml
@@ -1,6 +1,7 @@
 {% set name = 'stsci.convolve' %}
 {% set version = '2.2.0' %}
 {% set number = '0' %}
+
 about:
     home: https://github.com/spacetelescope/{{name}}
     license: GPL
diff --git a/stsci.distutils/meta.yaml b/stsci.distutils/meta.yaml
index 5675356..8054e89 100644
--- a/stsci.distutils/meta.yaml
+++ b/stsci.distutils/meta.yaml
@@ -1,12 +1,20 @@
+{% set name = 'stsci.distutils' %}
+{% set version = '0.3.8' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/embray/stsci.distutils
+    home: https://github.com/spacetelescope/stsci.distutils
     license: GPL
-    summary: stsci.distutils
+    summary: |
+        distutils/packaging-related utilities used by some of STScI's packages
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: stsci.distutils
-    version: 0.3.8
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -17,8 +25,10 @@ requirements:
     - nose
     - numpy
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/stsci.distutils
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - stsci.distutils
diff --git a/stsci.image/meta.yaml b/stsci.image/meta.yaml
index 12717ce..2b3838f 100644
--- a/stsci.image/meta.yaml
+++ b/stsci.image/meta.yaml
@@ -1,13 +1,21 @@
+{% set name = 'stsci.image' %}
+{% set version = '2.2.0' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/embray/stsci.image
+    home: https://github.com/spacetelescope/{{name}}
     license: GPL
-    summary: stsci.image
+    summary: |
+        Image array manipulation functions
+
 build:
-    number: '0'
+    number: {{number}}
     preserve_egg_dir: 'yes'
+
 package:
-    name: stsci.image
-    version: 2.2.0
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -24,8 +32,11 @@ requirements:
     - scipy
     - stsci.tools
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/stsci.image.git
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - stsci.image
diff --git a/stsci.imagemanip/meta.yaml b/stsci.imagemanip/meta.yaml
index f337ff3..fcda5ee 100644
--- a/stsci.imagemanip/meta.yaml
+++ b/stsci.imagemanip/meta.yaml
@@ -1,13 +1,20 @@
+{% set name = 'stsci.imagemanip' %}
+{% set version = '1.1.2' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/embray/stsci.imagemanip
+    home: https://github.com/spacetelescope/{{name}}
     license: GPL
-    summary: stsci.imagemanip
+    summary: STScI general image manipulation tools
+
 build:
-    number: '0'
+    number: {{number}}
     preserve_egg_dir: 'yes'
+
 package:
-    name: stsci.imagemanip
-    version: 1.1.2
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -20,8 +27,10 @@ requirements:
     - numpy
     - stsci.tools
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/stsci.imagemanip
+    git_url: https://github.com/spacetelescope/{{name}}
+
 test:
     imports:
     - stsci.imagemanip
diff --git a/stsci.imagestats/meta.yaml b/stsci.imagestats/meta.yaml
index ac51621..9da8dd9 100644
--- a/stsci.imagestats/meta.yaml
+++ b/stsci.imagestats/meta.yaml
@@ -1,13 +1,21 @@
+{% set name = 'stsci.imagestats' %}
+{% set version = '1.4.1' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/embray/stsci.imagestats
+    home: https://github.com/spacetelescope/{{name}}
     license: GPL
-    summary: stsci.imagestats
+    summary: |
+        Compute various useful statistical values for array objects
+
 build:
-    number: '0'
+    number: {{number}}
     preserve_egg_dir: 'yes'
+
 package:
-    name: stsci.imagestats
-    version: 1.4.1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -18,8 +26,10 @@ requirements:
     run:
     - numpy
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/stsci.imagestats
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - stsci.imagestats
diff --git a/stsci.ndimage/meta.yaml b/stsci.ndimage/meta.yaml
index aa1efc8..5aa8a2d 100644
--- a/stsci.ndimage/meta.yaml
+++ b/stsci.ndimage/meta.yaml
@@ -1,13 +1,22 @@
+{% name = 'stsci.ndimage' %}
+{% version = '0.10.1' %}
+{% number = '0' %}
+
 about:
-    home: https://github.com/embray/stsci.ndimage
+    home: https://github.com/spacetelescope/{{name}}
     license: GPL
-    summary: stsci.ndimage
+    summary: |
+        Various functions for multi-dimensional image processing
+        --fork of scipy.ndimage
+
 build:
-    number: '0'
+    number: {{number}}
     preserve_egg_dir: 'yes'
+
 package:
-    name: stsci.ndimage
-    version: 0.10.1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -20,8 +29,10 @@ requirements:
     - astropy >=1.1
     - numpy
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/stsci.ndimage
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - stsci.ndimage
diff --git a/stsci.numdisplay/meta.yaml b/stsci.numdisplay/meta.yaml
index 0b5410b..39dec3c 100644
--- a/stsci.numdisplay/meta.yaml
+++ b/stsci.numdisplay/meta.yaml
@@ -1,13 +1,21 @@
+{% set name = 'stsci.numdisplay' %}
+{% set version = '1.6.1' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/embray/stsci.numdisplay
+    home: https://github.com/spacetelescope/{{name}}
     license: GPL
-    summary: stsci.numdisplay
+    summary: |
+        Package for displaying numpy arrays in DS9
+
 build:
-    number: '0'
+    number: {{number}}
     preserve_egg_dir: 'yes'
+
 package:
-    name: stsci.numdisplay
-    version: 1.6.1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -19,8 +27,10 @@ requirements:
     - numpy
     - stsci.tools
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/stsci.numdisplay
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - stsci.numdisplay
diff --git a/stsci.skypac/meta.yaml b/stsci.skypac/meta.yaml
index d66bdb7..0116339 100644
--- a/stsci.skypac/meta.yaml
+++ b/stsci.skypac/meta.yaml
@@ -1,13 +1,20 @@
+{% set name = 'stsci.skypac' %}
+{% set version = '0.9' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/spacetelescope/stsci.skypac
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
     summary: stsci.skypac
+
 build:
-    number: '0'
+    number: {{number}}
     preserve_egg_dir: 'yes'
+
 package:
-    name: stsci.skypac
-    version: '0.9'
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
@@ -26,10 +33,11 @@ requirements:
     - stsci.tools
     - stwcs
     - python x.x
-    - python x.x
+
 source:
-    git_tag: '0.9'
-    git_url: https://github.com/spacetelescope/stsci.skypac
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - stsci.skypac
diff --git a/stsci.sphere/meta.yaml b/stsci.sphere/meta.yaml
index d5d0a4c..533e855 100644
--- a/stsci.sphere/meta.yaml
+++ b/stsci.sphere/meta.yaml
@@ -1,13 +1,19 @@
+{% set name = 'stsci.sphere' %}
+{% set version = '0.2' %}
+{% set number = '1' %}
+
 about:
     home: http://www.stsci.edu/institute/software_hardware
     license: GPL
-    summary: stsci.sphere
+
 build:
-    number: '1'
+    number: {{number}}
     preserve_egg_dir: 'yes'
+
 package:
-    name: stsci.sphere
-    version: '0.2'
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -22,8 +28,10 @@ requirements:
     - matplotlib
     - numpy
     - python x.x
+
 source:
-    git_url: https://bitbucket.org/stsci_ssb/stsci.sphere
+    git_url: https://bitbucket.org/stsci_ssb/{{name}}.git
+
 test:
     imports:
     - stsci.sphere
diff --git a/stsci.sphinxext/meta.yaml b/stsci.sphinxext/meta.yaml
index d7b3486..7c82771 100644
--- a/stsci.sphinxext/meta.yaml
+++ b/stsci.sphinxext/meta.yaml
@@ -1,13 +1,20 @@
+{% set name = 'stsci.sphinxext' %}
+{% set version = '1.2.2' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/spacetelescope/stsci.sphinxext
+    home: https://github.com/spacetelescope/{{name}}
     license: GPL
-    summary: stsci.sphinxext
+    summary: A set of tools and templates to customize Sphinx for use in STScI projects
+
 build:
-    number: '0'
+    number: {{number}}
     preserve_egg_dir: 'yes'
+
 package:
-    name: stsci.sphinxext
-    version: 1.2.2
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -19,8 +26,10 @@ requirements:
     - numpydoc
     - stsci.distutils
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/stsci.sphinxext
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - stsci.sphinxext
diff --git a/stsci.stimage/meta.yaml b/stsci.stimage/meta.yaml
index fb25406..a91eed7 100644
--- a/stsci.stimage/meta.yaml
+++ b/stsci.stimage/meta.yaml
@@ -1,13 +1,20 @@
+{% set name = 'stsci.stimage' %}
+{% set version = '0.2.1' %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/embray/stsci.stimage
+    home: https://github.com/spacetelescope/{{name}}
     license: GPL
     summary: stsci.stimage
+
 build:
-    number: '0'
+    number: {{number}}
     preserve_egg_dir: 'yes'
+
 package:
-    name: stsci.stimage
-    version: 0.2.1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -18,8 +25,10 @@ requirements:
     run:
     - numpy
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/stsci.stimage
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - stsci.stimage
diff --git a/stsci.tools/meta.yaml b/stsci.tools/meta.yaml
index ab78d1f..0edcb60 100644
--- a/stsci.tools/meta.yaml
+++ b/stsci.tools/meta.yaml
@@ -1,13 +1,21 @@
+{% set name = 'stsci.tools' %}
+{% set version = '3.4.2.1' %}
+{% set number = '0' %}
+
 about:
     home: https://github.com/spacetelescope/stsci.tools
     license: GPL
-    summary: stsci.tools
+    summary: |
+        Collection of tools specific to STScI packages
+
 build:
-    number: '0'
+    number: {{number}}
     preserve_egg_dir: 'yes'
+
 package:
-    name: stsci.tools
-    version: 3.4.2.1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -23,8 +31,11 @@ requirements:
     - pytools
     - stsci.distutils
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/stsci.tools
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}
+
 test:
     imports:
     - stsci.tools
diff --git a/stsci/meta.yaml b/stsci/meta.yaml
index d5473b4..d5b1454 100644
--- a/stsci/meta.yaml
+++ b/stsci/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'stsci' %}
+{% set version = '1.0.2' %}
+{% set number = '0' %}
+
 about:
-    home: http://stsci.edu
+    home: http://ssb.stsci.edu
     license: BSD
     summary: stsci meta-package
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: stsci
-    version: 1.0.2
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - stsci-hst
diff --git a/template/meta.yaml b/template/meta.yaml
index 463077e..695b54a 100644
--- a/template/meta.yaml
+++ b/template/meta.yaml
@@ -12,16 +12,16 @@ about:
 
 package:
     # Define these values above
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
 
 build:
     # Define this value above
-    number: {{ number }}
+    number: {{number}}
 
 source:
-    fn: {{ name }}-{{ version }}.tar.gz
-    url: http://example.com/example/{{ name }}-{{ version }}.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
+    url: http://example.com/example/{{name}}-{{version}}.tar.gz
 
 requirements:
     build:
@@ -30,7 +30,7 @@ requirements:
     - python x.x
     run:
     # Dependencies required at RUN-TIME go here
-    # - ...
+    - python x.x
 
 #test:
 #   imports:
diff --git a/threading2/meta.yaml b/threading2/meta.yaml
index fc855ea..a548101 100644
--- a/threading2/meta.yaml
+++ b/threading2/meta.yaml
@@ -1,23 +1,31 @@
+{% set name = 'threading2' %}
+{% set version = '0.2.1' %}
+{% set number = '0' %}
+
 about:
-    home: https://pypi.python.org/packages/source/t/threading2
+    home: https://pypi.python.org/packages/source/t/{{name}}
     license: BSD
-    summary: threading2
+    summary: like the standard threading module, but awesomer
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: threading2
-    version: 0.2.1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - setuptools
     - python x.x
     run:
     - python x.x
+
 source:
-    fn: threading2-0.2.1.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
     md5: 4ffb227b9a0e1f3e2a42f69f92a47bae
-    url:
-    - https://pypi.python.org/packages/source/t/threading2/threading2-0.2.1.tar.gz
+    url: https://pypi.python.org/packages/source/t/{{name}}/{{name}}-{[version}}.tar.gz
+
 test:
     imports:
     - threading2
diff --git a/traceback2/meta.yaml b/traceback2/meta.yaml
index f4c5ae5..ae5ba4e 100644
--- a/traceback2/meta.yaml
+++ b/traceback2/meta.yaml
@@ -1,12 +1,19 @@
+{% set name = 'traceback2' %}
+{% set version = '1.4.0' %}
+{% set number = '0' %}
+
 about:
-    home: https://pypi.python.org/packages/source/t/traceback2
+    home: https://pypi.python.org/packages/source/t/{{name}}
     license: BSD
-    summary: traceback2
+    summary: Backports of the traceback module
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: traceback2
-    version: 1.4.0
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - pbr
@@ -19,11 +26,12 @@ requirements:
     - linecache2
     - six
     - python x.x
+
 source:
-    fn: traceback2-1.4.0.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
     md5: 9e9723f4d70bfc6308fa992dd193c400
-    url:
-    - https://pypi.python.org/packages/source/t/traceback2/traceback2-1.4.0.tar.gz
+    url: https://pypi.python.org/packages/source/t/{{name}}/{{name}}-{{version}}.tar.gz
+
 test:
     imports:
     - traceback2
diff --git a/verhawk/meta.yaml b/verhawk/meta.yaml
index 886588a..1f6e511 100644
--- a/verhawk/meta.yaml
+++ b/verhawk/meta.yaml
@@ -3,23 +3,28 @@
 {% set number = '0' %}
 
 about:
-    home: http://github.com/spacetelescope/verhawk
+    home: http://github.com/spacetelescope/{{name}}
     license: BSD
     summary: A simple Python package version scanner
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - setuptools
     - python x.x
     run:
     - python x.x
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/spacetelescope/verhawk.git
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - verhawk
diff --git a/webbpsf-data/meta.yaml b/webbpsf-data/meta.yaml
index 852cd6e..6ea0ffa 100644
--- a/webbpsf-data/meta.yaml
+++ b/webbpsf-data/meta.yaml
@@ -1,13 +1,19 @@
+{% set name = 'webbpsf-data' %}
+{% set version = 0.5.0 %}
+{% set number = '0' %}
+
 about:
-    home: http://www.stsci.edu/~mperrin/software/webbpsf
+    home: http://www.stsci.edu/~mperrin/software/{{name}}
     license: BSD
-    summary: webbpsf-data data files
+    summary: webbpsf data files
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: webbpsf-data
-    version: 0.5.0
+    name: {{name}}
+    version: {{version}}
+
 source:
-    fn: webbpsf-data-0.5.0.tar.gz
-    url:
-    - http://www.stsci.edu/~mperrin/software/webbpsf/webbpsf-data-0.5.0.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
+    url: http://www.stsci.edu/~mperrin/software/{{name}}/{{name}}-{{version}}.tar.gz
diff --git a/webbpsf/meta.yaml b/webbpsf/meta.yaml
index b4127ce..baf16c7 100644
--- a/webbpsf/meta.yaml
+++ b/webbpsf/meta.yaml
@@ -1,13 +1,22 @@
+{% set name = 'webbpsf' %}
+{% set version = '0.6.1' %}
+{% set tag = 'v' + version %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/mperrin/webbpsf
+    home: https://github.com/mperrin/{{name}}
     license: BSD
-    summary: webbpsf
+    summary: |
+        Creates simulated point spread functions for the James Webb Space Telescope
+
 build:
-    number: '0'
+    number: {{number}}
     preserve_egg_dir: 'True'
+
 package:
-    name: webbpsf
-    version: 0.5.1
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
@@ -33,9 +42,11 @@ requirements:
     - python x.x
     - ipywidgets
     - jwxml
+
 source:
-    git_tag: v0.5.1
+    git_tag: {{tag}}
     git_url: https://github.com/mperrin/webbpsf
+
 test:
     commands:
     - WEBBPSF_PATH=$PREFIX/share/webbpsf-data python -c 'import webbpsf'
diff --git a/wfc3tools/meta.yaml b/wfc3tools/meta.yaml
index 218212c..efec653 100644
--- a/wfc3tools/meta.yaml
+++ b/wfc3tools/meta.yaml
@@ -3,14 +3,17 @@
 {% set number = '0' %}
 
 about:
-    home: https://github.com/spacetelescope/{{ name }}
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
     summary: For analyzing and calibrating HST-WFC3 data
+
 build:
-    number: {{ number }}
+    number: {{number}}
+
 package:
-    name: {{ name }}
-    version: {{ version }}
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - astropy >=1.1
@@ -27,9 +30,11 @@ requirements:
     - stsci.tools
     - matplotlib
     - scipy
+
 source:
-    git_tag: {{ version }}
-    git_url: https://github.com/spacetelescope/{{ name }}.git
+    git_tag: {{version}}
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - wfc3tools
diff --git a/wfpc2tools/meta.yaml b/wfpc2tools/meta.yaml
index ee2f6a9..ce444a2 100644
--- a/wfpc2tools/meta.yaml
+++ b/wfpc2tools/meta.yaml
@@ -1,12 +1,20 @@
+{% set name = 'wfpc2tools' %}
+{% set version = '1.0.3' %}
+{% set number = '0' %}
+
 about:
-    home: http://
+    home: https://github.com/spacetelescope/{{name}}
     license: BSD
-    summary: wfpc2tools
+    summary: |
+        Tools for use with WFPC2 (Wide Field and Planetary Camera 2)
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: wfpc2tools
-    version: 1.0.3
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - d2to1
@@ -25,8 +33,10 @@ requirements:
     - stsci.tools
     - numpy
     - python x.x
+
 source:
-    git_url: https://github.com/spacetelescope/wfpc2tools
+    git_url: https://github.com/spacetelescope/{{name}}.git
+
 test:
     imports:
     - wfpc2tools
diff --git a/ws4py/meta.yaml b/ws4py/meta.yaml
index 47c5e7a..7c05cad 100644
--- a/ws4py/meta.yaml
+++ b/ws4py/meta.yaml
@@ -1,23 +1,31 @@
+{% name = 'ws4py' %}
+{% version = '0.3.4' %}
+{% number = '0' %}
+
 about:
-    home: https://pypi.python.org/packages/source/w/ws4py
+    home: https://pypi.python.org/packages/source/w/{{name}}
     license: BSD
-    summary: ws4py
+    summary: WebSocket client and server library for Python 2 and 3 as well as PyPy
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: ws4py
-    version: 0.3.4
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - setuptools
     - python x.x
     run:
     - python x.x
+
 source:
-    fn: ws4py-0.3.4.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
     md5: 6b47e33cbd13f5c134b04f2a44a480ad
-    url:
-    - https://pypi.python.org/packages/source/w/ws4py/ws4py-0.3.4.tar.gz
+    url: https://pypi.python.org/packages/source/w/{{name}}/{{name}}-{{version}}.tar.gz
+
 test:
     imports:
     - ws4py
diff --git a/xpa/meta.yaml b/xpa/meta.yaml
index a0798f1..fe9b76f 100644
--- a/xpa/meta.yaml
+++ b/xpa/meta.yaml
@@ -1,15 +1,24 @@
+{% set name = 'xpa' %}
+{% set version = '2.1.17' %}
+{% set tag = 'v' + version %}
+{% set number = '0' %}
+
 about:
-    home: https://github.com/ericmandel/xpa
+    home: https://github.com/ericmandel/{{name}}
     license: MIT
     summary: Provides seamless communication between many kinds of Unix programs
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: xpa
-    version: 2.1.17
+    name: {{name}}
+    version: {{version}}
+
 source:
-    git_tag: v2.1.17
-    git_url: https://github.com/ericmandel/xpa
+    git_tag: {{tag}}
+    git_url: https://github.com/ericmandel/{{name}}.git
+
 test:
     commands:
     - test -x `which xpaget`
diff --git a/yolk/meta.yaml b/yolk/meta.yaml
index 9e91f84..1fc9864 100644
--- a/yolk/meta.yaml
+++ b/yolk/meta.yaml
@@ -1,23 +1,31 @@
+{% set name = 'yolk' %}
+{% set version = '0.4.3' %}
+{% set number = '0' %}
+
 about:
-    home: https://pypi.python.org/packages/source/y/yolk
+    home: https://pypi.python.org/packages/source/y/{{name}}
     license: BSD
-    summary: yolk
+    summary: Command-line tool for querying PyPI and Python packages installed on your system
+
 build:
-    number: '0'
+    number: {{number}}
+
 package:
-    name: yolk
-    version: 0.4.3
+    name: {{name}}
+    version: {{version}}
+
 requirements:
     build:
     - setuptools
     - python x.x
     run:
     - python x.x
+
 source:
-    fn: yolk-0.4.3.tar.gz
+    fn: {{name}}-{{version}}.tar.gz
     md5: 10dfabca7a020058436aec9dbad70123
-    url:
-    - https://pypi.python.org/packages/source/y/yolk/yolk-0.4.3.tar.gz
+    url: https://pypi.python.org/packages/source/y/{{name}}/{{name}}-{{version}}.tar.gz
+
 test:
     commands:
     - yolk