Upgraded dependencies

Sorry for the very messy git log, I don't know what I messed up but multiple rebases caused that.