bugfix i3conf
some uncommitted changes around i3lock
Merge branch 'master' of https://github.com/axelmagn/dotfiles