ignore .diff files
Merge branch 'master' of github.com:NPrescott/slackoff