i3
Merge branch 'master' of github.com:hspak/dotfiles

* 'master' of github.com:hspak/dotfiles:
  cleanup
  vim