added config options for disabling vanilla ore generation
Merge remote-tracking branch 'origin/master' into local