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. I think that all the changes that were made in master between when astropy-helpers was first created and now have now been merged in.