Chris, I removed your change for the address size since it should no longer be needed.  I also left in the change that someone made to ifdef out "NumberOfFiles and MRAMFiles in the configuration partition of the MRAM (that leaves a lot more space!)