Address review by @mhvk [skip travis]
Address review by @mhvk [skip travis]

dhomeier/astropy,mhvk/astropy,astropy/astropy,saimn/astropy,saimn/astropy,pllim/astropy,mhvk/astropy,pllim/astropy,larrybradley/astropy,lpsinger/astropy,dhomeier/astropy,StuartLittlefair/astropy,StuartLittlefair/astropy,StuartLittlefair/astropy,aleksandr-bakanov/astropy,lpsinger/astropy,StuartLittlefair/astropy,pllim/astropy,mhvk/astropy,astropy/astropy,saimn/astropy,saimn/astropy,pllim/astropy,aleksandr-bakanov/astropy,larrybradley/astropy,astropy/astropy,aleksandr-bakanov/astropy,larrybradley/astropy,dhomeier/astropy,larrybradley/astropy,lpsinger/astropy,mhvk/astropy,saimn/astropy,dhomeier/astropy,lpsinger/astropy,StuartLittlefair/astropy,astropy/astropy,aleksandr-bakanov/astropy,dhomeier/astropy,mhvk/astropy,astropy/astropy,lpsinger/astropy,larrybradley/astropy,pllim/astropy