fix desktop-path
Merge branch 'master' of https://github.com/dougbeal/home
osx /etc/paths file
ignore emacs tmp files
Merge branch 'master' of https://github.com/dougbeal/home

Conflicts:
	emacs/dpb-custom.el
added emacs editor