Merge branch 'afn' of github.com:2k0ri/dotfiles into afn