Windows specific settings.
Merge branch 'master' of github.com:chebert/emacs.d

Conflicts:
	.gitignore
	init.el