ignore eshell history lastdir srecode-map.el
Merge branch 'master' of https://github.com/fs814/Settings

Conflicts:
	.emacs.d/eshell/history
	.emacs.d/eshell/lastdir
	.emacs.d/srecode-map.el