Refactor: remove horrible 'yas--trigger-key-for-fallback' and rework 'yas--fallback'
Aesthetic fix to README.mdown
Merge pull request #321 from luismbo/patch-1

Fix: aesthetic fix to README.mdown
quieten byte-compiler
checkdoc + spelling
future-proof against obsoleting of `flet'
flet will be marked obsolete starting in Emacs 24.3
Merge pull request #325 from rolandwalker/doc

Docfix: checkdoc + spelling
Merge pull request #323 from rolandwalker/byte-compiler

Fix: quieten byte-compiler
Add: easier to run tests
Fix: correct expectation for this test in batch-mode
Closes #296: No longer use customizable `yas-trigger-key` and friends.

Use keymaps that the user can customise with `define-key` like all the
other modes
Merge branch 'trigger-key-fallback-cleanup'

Conflicts:
	yasnippet.el
Fix: expose and honour `yas-dont-activate`
Fix: need to require `assoc`, since using `aget` somewhere
Closes #253.
comment
Merge remote-tracking branch 'rolandwalker/flet'

Conflicts:
	yasnippet.el
replace interactive-p with called-interactively-p macro
tested compatible with GNU Emacs v 22.x - 24.x
Merge pull request #328 from rolandwalker/byte-compiler-2

Fix: new 'yas--called-interactively-p' to shoosh byte-compiler
reorder defuns to quieten byte-compiler
Two warnings avoided:
function `yas-define-snippets' defined multiple times in this file
the function `yas-define-snippets' is not known to be defined