Use reset HEAD to unstage files, rm --cached only applies on initial commit
Merge branch 'benzie-master' into benzie-merging