More 1.8 fixes

Tech/religion strip updates
Related changes to other files
Merged technology.txt


And now aimed at the right branch.