Zotonic

Not sure if you prefer frequent merges, or to save them up a bit..

If you leave this open new commits will show up as I push them... ;)

Most notable change in this change set is that I save the original list of tokens scanned, so I can restore the remaining token list when bailing from a failed parse.