Disable swap files, as they trigger too many events
Merge branches 'master' and 'no_swap'