Fixups after rebase
Fixups after rebase

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