Fix undefined variable in parser
Merge pull request #69 from mattbasta/patch-1

Fix undefined variable in parser
don't autoescape inside macros
Merge remote-tracking branch 'origin/master'
better autoescaping for macros