cleanup
Merge branch 'master' of github.com:shashashasha/gifbot
new uploader code