Properly overwrite filenames#2

tyll wants to merge 3 commits intoberke:masterberke/wipe:masterfrom

tyll:filenamestyll/wipe:filenamesCopy head branch name to clipboard