updated yml with my username
removed cache of yaml
updates to Giphy model
Fixed Merge Conflicts