merge tweepy from head
finish removing the upload param to render_html()
Merge commit '7b0a62eefb3751174378827b96eabd959d174e20'