Removed macros.py (no longer used).  Replaced by empy templates.