resolve more rebase issues
resolve more rebase issues

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