Merged caffeine-oneclick into caffeine-systray.