[BSPWM] Use mod1 and mod2 on OSX
[BSPWM] Merge changes