Merge in updates from the Main Aurora-Sim Repository.

Signed-off-by: EmperorStarfinder <emperor@secondgalaxy.com>