I uncommented the two EEPROM defines in configuration.h, and removed my +4 from marlin_main. Compiled and uploaded, sent a M502 then a M500, then ran G28 through pronterface, followed by G1 Z0. Nozzle stopped 4mm above the bed. Re-commented the EEPROM defines, re-added my +4, and uploaded.