resolved merge conflicts for pull request #126 by @eostrom (Youtube uploads)

finally got around to do this. sorry all for the delay.