Well,
I'm not sure what I did but somehow all my controls got changed around.  Coin 1 and 2 got changed from 5 and 6 to 3 and 4.  And Player 1's controls got changed form Arrows to Numpad.
They got changed for every game.  Is this stored in a file somewhere I can just delete and have Mame reset them to the defaults?
I'm pretty sure this happened because I was testing the Johnny5 thing and had to set my ctrlr to XArcade which uses the new settings.  If I comment out the ctrlr line in mame.ini will it revert back to the norm?  But then that will break Johnny5...
hmm