Enable dired-x by default
Clean code
Merge remote-tracking branch 'origin/master' into dev