Fixed a mistake I made in merging data/npc.data
fixing merge mistakes (should have deleted /wsgi)
flag generator first round of refactoring for testability (only on flag symbols)
Testability refactor of js for flag symbols. Also wrapped functions with the flag_gen object to avoid polluting the global scope.
Refactored flagshape.js for testability, but I think I actually made it worse... more work needed.
Split the flag generator JS into tighter units to improve testability
Testability refactor for flag generator's overlays (flagoverlays.js), including some utility functions to be shared betweeb overlays and divisions (flagutils.js)
Forgot to remove a testing hack in the last commit
Testability refactor of flagdivision.js for flag generator, and some integration between divisions and overlays
Merge branch 'develop' into multiflag

Conflicts:
	data/npc.data