Don't use a plus-sign to quote spaces
Merge branch 'master' of github.com:evanmiller/erlydtl
Merge pull request #83 from kaos/zotonic

Allow extension module to hook into the custom tags.
Keep original scanned tokens.

In case of parse failures, the consumed tokens may have been
transformed when put onto the value stack, so we can't simply
move them back. So we look up the correct point in the original
list of tokens and replace our remaining tokens with those
from the original list.