merge with remote file deletion
Merge branch 'master' of https://github.com/yvanscher/malamute
blehr