Changes to work with awesome 3.5
Merge branch 'master' of github_magic:andrew-wja/dotfiles