Added support for kdiff3 as a merge tool
Added myself to contributors section
Merge pull request #137 from mkjpryor/kdiff3_support

fcm merge: kdiff3 support
fcm commit: don't commit message file
Merge pull request #139 from matthewrmshin/dont-commit-message-file

fcm commit: don't commit message file