Clean up photo.controller
Merge pull request #36 from areagray/master

Clean up photo.controller