Register new snapshots
auto merge of #295 : alexcrichton/cargo/snapshots, r=alexcrichton,me
Merge branch 'master' of github.com:rust-lang/cargo into travis

Conflicts:
	.travis.yml