Update for latest master
Cargo support
Make Travis play nicely with Cargo
Fix code in comment