Starting to generalize, combine, and stuff
Merge branch 'master' of https://github.com/AlexaVillaume/Photometry

Beginning to add general forms of the photometry functions