more changes to address travis build failures
more changes to address travis build failures

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