Kind of untangling world generation and such.
Merge remote-tracking branch 'origin/master'