Updated emacs.el to work better on Windows
Merge branch 'master' of https://github.com/jesperes/initfiles