Old changes from the south
Other changes that should be selected to.
More changes from the emacs.d dir
One last change before pull.
Merge current windows and linux versions.