Update from world gen refactoring

Using Terasology from the PR MovingBlocks/Terasology#1181