update debugging macros
Merge branch 'master' of github.com:mgreenly/programming-gambit