Add Cargo.lock to gitignore
Update for latest Cargo
Merge branch 'master' into dev

* master:
  Update for latest Cargo
  Add Cargo.lock to gitignore