Merging some stuff from branch 'archlinux'
Merge branch 'master' of https://github.com/smockey/dotfiles