Initial workspace layout for i3. Fixed small merge change.
Removed letterspacing hack in Xresources
Merge branch 'master' into work