Removed desktop-specific settings from master i3 config
Small changes to i3 config
Merge branch 'master' into laptop