Fixups after rebasing
Fixups after rebasing

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