Better slate config.
Attempting to make hg merge use emacs properly as merge client but I think I failed or gave up.
Figured out how to get different config for WorkLog emacs, yay!
Merge branch 'master' of github.com:pnkfelix/DotFiles