Small patch: Adding double combat speed option

Adding a new setting to speed up combat speed. Fixed some other text issues in the mines. I think I have addressed the tavern issues with Vikings getting removed when you merge units.