Code Cleanup
Test for a new feature (#17)
Merge branch 'master' of https://github.com/sidben/VillagerTweaks