Merge pull request #1 from ttk2/master

updating from ttk2
Merge pull request #2 from Civcraft/master

copy from civcraft
Citadel 2.6 compatibility
Merge pull request #5 from WildWeazel/civcraft

Citadel 2.6 compatibility