Updated to latest version of astropy-helpers.

This version includes remaining changes that were made to the core package but not ported over to astropy-helpers.
Merge pull request #2547 from astrofrog/update-astropy-helpers

Updated to latest version of astropy-helpers.