Fixed bug where it didn't save new settings
Clean up the flagwatcher converting code
Fix potential infinite loop
Added alias 'u' to command undisguise