Macros from another template now have access to the main context
Merge branch 'master' of https://github.com/mbosecke/pebble