Logging out and in resets modifier keys to defaults
Uninstalled Intellitype
Restarted in safe mode (hold shift)
Use Disk Utility to Repair Permissions
Restart


Seems to have fixed the problem.  Perhaps some config file wasn't writable?  Who knows ..