auto merge of #220 : erickt/cargo/master, r=alexcrichton
auto merge of #220 : erickt/cargo/master, r=alexcrichton

Please don't land this until https://github.com/wycats/hammer.rs/pull/12 is landed, or else it will break the build.

erickt/cargo,erickt/cargo