updated to work with rust master
Merge branch 'master' of github.com:CraZySacX/cargo