Added multiple entry capability for creating villagers via Yaml
Merge branch 'master' of https://github.com/Dove-Bren/SecretVillager

Conflicts:
	src/com/SkyIsland/SecretVillager/SecretVillagerPlugin.java
Added multiple entry capability for Secret Villager
Also fixed some merging conflicts