Address comments in the pull request
Address comments in the pull request

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