Adding git merge options for the True Hackers
Making rmTODOs() ignore any TODO.md in the root dir
rmTODOs() -> rmByFileName(), more general approach