Show how to use globals in macros

Also fixes preg issue if there were $ signs in the macro
Merge branch 'master' of https://github.com/zenphoto/zenphoto