Swaps LS,LS2 for LS1,LS

Global aliases add '| less -S' to the end of commands:

e.g.:

    seq 100 LS

expands (now) to:

    seq 100 |& less -S

Idea of this commit is that usually you want the shorter global alias to
also capture stderr.  So, the old LS2 is now the "default" LS, but the
old LS behavior can be had via LS1.
Prevents running git merge droppings

Excludes files like .zsh_prompt.orig and
.zsh_prompt.REMOTE.2222.zsh_prompt.
Removes outdated `em` alias
Fixes revbump when VERSION uses single quotes
Adds image() function for use as glob qualifier

E.g.  `feh ~/Downloads/*(+image)`
Ensures couchdb is called silently
Refactors setting up couchdb params
Adds "session" ID to couchdb history
Wraps nosefart w/ padsp-like variables
Adds "real" PWD to prompt
Sets `pip` to cache downloaded eggs
Adds "presentation" mode functions
load_namedirs experiment

Possibly-simpler way of managing all of my per-machine named
directories.
Adds wrapper to set up `leapd` command