Unfortunately this doesn't fix the undo problem
Merge branch 'master' of github.com:yramagicman/dotfiles

* 'master' of github.com:yramagicman/dotfiles:
  fold markers at an un-Godly hour of the night