Merge pull request #28 from tsdh/master

Fix #27 and improve #25
Add diff-mode and makefile-mode to excluded-modes.