Branch off of right thing.  Also PEP8ify test code.
Branch off of right thing.  Also PEP8ify test code.

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