Adds a better UI for settings
Merge branch 'master' of github.com:emersion/bups