TRAMP fix for Windows
Merge branch 'master' of https://github.com/DanAlbert/.emacs.d

Conflicts:
	init.el
Merge branch 'master' of https://github.com/DanAlbert/.emacs.d