Fixes from @mdboom and (hopefully) fix failing test
Fixes from @mdboom and (hopefully) fix failing test

lpsinger/astropy,lpsinger/astropy,stargaser/astropy,StuartLittlefair/astropy,astropy/astropy,StuartLittlefair/astropy,mhvk/astropy,stargaser/astropy,astropy/astropy,kelle/astropy,funbaker/astropy,dhomeier/astropy,DougBurke/astropy,lpsinger/astropy,AustereCuriosity/astropy,astropy/astropy,MSeifert04/astropy,dhomeier/astropy,AustereCuriosity/astropy,funbaker/astropy,mhvk/astropy,bsipocz/astropy,DougBurke/astropy,joergdietrich/astropy,dhomeier/astropy,lpsinger/astropy,mhvk/astropy,larrybradley/astropy,dhomeier/astropy,stargaser/astropy,aleksandr-bakanov/astropy,joergdietrich/astropy,saimn/astropy,StuartLittlefair/astropy,MSeifert04/astropy,tbabej/astropy,kelle/astropy,kelle/astropy,aleksandr-bakanov/astropy,kelle/astropy,mhvk/astropy,pllim/astropy,pllim/astropy,MSeifert04/astropy,joergdietrich/astropy,larrybradley/astropy,larrybradley/astropy,pllim/astropy,AustereCuriosity/astropy,StuartLittlefair/astropy,mhvk/astropy,astropy/astropy,lpsinger/astropy,joergdietrich/astropy,joergdietrich/astropy,tbabej/astropy,tbabej/astropy,pllim/astropy,saimn/astropy,AustereCuriosity/astropy,funbaker/astropy,DougBurke/astropy,AustereCuriosity/astropy,bsipocz/astropy,dhomeier/astropy,pllim/astropy,funbaker/astropy,larrybradley/astropy,bsipocz/astropy,saimn/astropy,saimn/astropy,larrybradley/astropy,astropy/astropy,bsipocz/astropy,stargaser/astropy,kelle/astropy,tbabej/astropy,saimn/astropy,tbabej/astropy,StuartLittlefair/astropy,aleksandr-bakanov/astropy,DougBurke/astropy,aleksandr-bakanov/astropy,MSeifert04/astropy