Simplify annulus photometry

This relies on #165 and should not be merged until that one is merged and this is rebased. Then the diff here will be simpler.

Basically the idea is rather than do photometry twice and find the difference, we simply find the difference of the 'fraction' masks before adding up the pixels. This only possible with #165.