Teach deploy script to keep repo cleaner

Use `git rm` instead of `rm` to remove old deploy files and dirs from
index.
Merge branch 'deploy-no-garbage'