vim and inotify-tools
Merge branch 'master' of github.com:norcams/himlar

Merge upstream