Automatic commit by update-base-branch
Merge branch 'master-base'
auto_sacrifice = prompt, show_travel_trail = true
Add a bunch of things from Kal.rc