Merge pull request #5 from pjf/master

im in ur fork, merging ur branch
Merge remote-tracking branch 'upstream/master'
added more ignore files for performance analysis files
Merge remote-tracking branch 'upstream/master'
fix for issue #58

fix for the issue where the 4 entities recently changed no longer show
up in worldgen
Merge branch 'master' into nerfed_diseases

* master:
  fix for issue #58
  added more ignore files for performance analysis files