cleanup for merge; use machine-dependent int size for range check
cleanup for merge; use machine-dependent int size for range check

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