Fix various things
Merge branch 'master' of https://github.com/Chevelle/conky-rings