Additional changes to duply-with-powernap post / git add/rm'ing older uncommitted...