Merge branch 'master' into rainbarf
configure rainbarf via ~/.rainbarf.conf
Merge branch 'rainbarf' into custom