Removes Kaleidoscope as diff tool and use diff3
Always ignore .DS_Store files
Don't use huge font in macvim
Don't use TODO files anymore