astropy/astropy — pull request #1981 by mdboom (2014-01-21 14:17:17+00:00)
Title: Rebase of #1463

This is a rebase of #1463 on master. I think #1463 is failing because of some bugs with warning testing that have since been fixed on master, and this PR is to test that theory before merging it.