Some updates to gitignore, emacs w32

Don't annoy about unsafe directories in Windows. Other minor stuff in
gitignore to ignore eshell and emacs-desktop files.
Merge branch 'master' of ssh://github.com/hershal/conf.d

Conflicts:
	.gitignore
	emacs