#50: Disable in vimdiff mode
Merge pull request #51 from FlashKorten/master

#50: Disable in vimdiff mode