Added putnamagic stuff
Changed worldgen settings for putnamagic
Removed test stuff
Merge branch 'master' into graphical