Merged master and worldgen. Also derp.