Merge pull request #165 from astrofrog/elliptical-overlap-grid

Cleanup of Cython code
Simplify how annulus photometry is handled
Fix doctest