Further cleanups
Further cleanups

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