unfavorite is broken. i tried. i will try harder
Merge branch 'master' of github.com:tommyb67/gifbomb into mck
some more fixes
fixed merge conflicts