Use i3-dmenu-desktop rather than dmenu_run
Merge branch 'master' into laptop