Merge awesome rc.lua changes from work machine