Merge pull request #6 from izreal/master

Fixes for Cargo plugin
cleanup/tweak properties files/build
cargo fixes and formatting cleanup