Update to master
auto merge of #219 : alexcrichton/cargo/update-to-mater, r=burningtree