Fix issue on alternate-editor.
Merge branch 'master' of https://github.com/massix/.emacs.d

Conflicts:
	emacsclient.sh