merge with awesome 3.5 rc.lua, things not working