* 125 commits merged from master * Converts a number of simple_animal mobs to the new format * Grammar fixes