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