resolve merge conflict in image utils
Merge pull request #58 from ellisowen/pixel_area

Implement solid_angle function in image utils.