Long overdue changes. Holy cow.
Really much needed commit here.
Merge branch 'master' of https://github.com/eedmond/FooBartender