Use vimdiff, Luke
Find is forever
Merge branch 'master' of github.com:ttsiodras/utils