New Macro System

Replaces the old Pierogi macro mechanism with a new one based on
XML.  Should be much more flexible and easier to manage.