handle initialization errors cleanly, clean stuff up

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@13359 3db68df2-c116-0410-a063-a993310a9797
Fix grouping of garrisoned units. Patch by mimo. Fixes #1918.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@13360 3db68df2-c116-0410-a063-a993310a9797
Display number of garrisoned units when trying to garrison. Patch by mimo. Fixes #1915.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@13361 3db68df2-c116-0410-a063-a993310a9797
Fix roman merchant ship trading distance. Fixes #1874.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@13362 3db68df2-c116-0410-a063-a993310a9797
Gates now handle allies made using diplomacy.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@13363 3db68df2-c116-0410-a063-a993310a9797
Stop hotkey. Patch by alpha123. Fixes #1870.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@13364 3db68df2-c116-0410-a063-a993310a9797
Merge remote-tracking branch 'remotes/trunk'