Merge pull request #2834 from embray/astropy-helpers-update

Update astropy_helpers to the commit that will be tagged v0.4.1