Merge astropy:package-template affiliated package infrastructure
Merge pull request #106 from keflavich/astropy_template2

Astropy-package-template: try 2