Tweaks to enable importing/running astropy out of a source checkout on Python 3
Merge pull request #2828 from embray/misc/python3

Enable importing Astropy from a source checkout on Python 3