Don’t refocus TextMate after executing a command

This was necessary to make TextMate 1.x rescan project folder for changed files, but 2.0 should automatically pick up changes done to the file system.
Don’t hardcode path to FileMerge.app