merge tweetbot + twitpic to /api/upload

/api/tweetbot temporarily aliased