Add mergetool.
Add .ropeproject to ignores.