Changes to make build independent of version of astropy
Merge pull request #36 from bernie-simon/bsimon-version-2

Changes to make build independent of version of astropy.