merge macbook init-local.el