hlwm and pybar updated
autostart merge conflict resolved