Changes to setup_helpers.py from astropy/astropy#2223
Changes to test_helpers.py from astropy/astropy#2353, astropy/astropy#2214, and astropy/astropy#2094
Changes to test_helpers.py from astropy/astropy#2198
Merge pull request #21 from astrofrog/update-from-astropy

Update from astropy