Update dependencies and update to rust master
auto merge of #688 : alexcrichton/cargo/update, r=alexcrichton