Patch Set 2: Looks good to me, but someone else must approve

Looks good to me.

We should file bugs for missing functionality, like the lack of adding to the .gitignore doing this op and whether we actually consult the ignored list during presentation etc.