closes #391: don't assume `declare-function'/ exists, it doesn't in emacs22
Merge remote-tracking branch 'upstream/master' into customizable-snippet
Factor out embedded elisp code

* yasnippet.el (yas--key-from-desc): Added
Assume NO-TEMPLATE is non-nil if `yas-new-snippet-default' is nil