Misc changes per Kale (nw)
Fixed compile when MODEL2_VIDEO_DEBUG is 1, nw
Merge git://git.redump.net/mame