updated to macro paradise 2.0 M4, added gitignores