Merge pull request #1241 from MLH-Fellowship/macros_with_globals

Fix bug with imported macros and template globals