Clarification/simplificication following comments from Michael Seifert.
Clarification/simplificication following comments from Michael Seifert.

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