Fix merge
Merge branch 'master' of github.com:daGrevis/Dotfiles
Change layouts for awesome