i3 changes
fix merge
Merge branch 'master' of github.com:mshade/dotfiles