Fixes the issue with pip; this will however change the default behavior of setup.py install now that we're actually using the setuptools install.  I don't think this should have any adverse affects.
Merge pull request #589 from iguananaut/issue-589

pip install of astropy broken