astropy/astropy — pull request #2279 by astrofrog (2014-04-05 13:08:22+00:00)
Title: Documentation fixes

Rebased version of #2217 - opening a PR to test on Travis since I'm getting weird failures locally