Simplify how annulus photometry is handled
Fix doctest
Merge pull request #166 from astrofrog/simplify-annulus

Simplify annulus photometry