removed unneeded import that causes failure when merging with master
removed unneeded import that causes failure when merging with master

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