Rename macros consistent with "if" and "when" forms

Macros now reflect their semantics by mirroring the standard "if" and
"when" Elisp forms. Obsolete aliases are defined for the old names.
Version 0.2