added section for ediff; added OS check to customize PATH
Merge branch 'master' of https://github.com/fatehks/emacs

Conflicts:
	emacs-local.el
	init.el