astropy/astropy — pull request #1191 by nden (2013-06-14 16:39:16+00:00)
Title: Models docfixes

#1044 equivalent (there must be a more efficient way to do this, without opening a new PR)

rebased and resolved conflicts
@keflavich ready to merge?