Fix installation with vanilla setuptools
Write if logic more concisely
Merge pull request #635 from astrofrog/fix-vanilla-setuptools-install

Attempt to fix Astropy installation with vanilla setuptools