Update photos methods to take in options for search
Merge branch 'photos_index'