Noted some weird behavior in repo.save_working_file(), for test/fix
Replaced pull rebase with merge in repo.save_working_file()
Added layout to front matter