minor building fix

typos in the castle haven and city haven files were causing them to not
be buildable.  Fixed typos.  Also removed .bak files.