add multiple-include protectors
Merge branch 'master' of github.com:dstndstn/astrometry.net