5b fixes

@hengchu I incorporated all your feedback from the previous PR. Super helpful!!

I moved the API keys to a private file that is in .gitignore. Let me know how you think we should handle this cause without the file no one else can test Photos.