auto merge of #217 : gchp/cargo/docs, r=alexcrichton
auto merge of #217 : gchp/cargo/docs, r=alexcrichton

There were inconsistencies in the manifest file between using `[[bin]]` and `[[executable]]`. I've changed the examples to use `[[bin]]` for consistency.

erickt/cargo,erickt/cargo