Update with master changes
auto merge of #131 : alexcrichton/cargo/update-to-master, r=update