Modifications for successful out-of-the-box build

Implemented the changes outlined at:
http://forums.civfanatics.com/showthread.php?t=479374