I should not have merged this here.
More comments
- Fix pass of parameters
- Add new function `ecd'.
Fix alias `eeval'
Fix indentation
New function `efile`
Fix builtin `ecd' when file path contains space characters.
Merge remote-tracking branch 'upstream/master' into emacs

Conflicts:
	plugins/emacs/emacs.plugin.zsh
	plugins/emacs/emacsclient.sh
Comment
Do not overwrite EDITOR environment variable if already defined.
Fix /bin/sh compatibility issue in install.sh
more catspeak
git lol
plugged_in function
gitfast: update to upstream v1.8.4

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
don't clobber existing RBENV_ROOT & follow Homebrew's default behavior
Added/modified some useful aliases.
catimg plugin
allow to print an image to the stdout using convert
Fix for virtualenv support - fixes #2328, fixes #2297, resolves #2319
Fixed a dirs bug for catimg