Merge pull request #1 from RoyCurtis/master

Update to upstream
ConfigFiles
Final configuration file, for modded packs
Merge pull request #2 from KJ4IPS/master

Added a configuration file to add new names, mainly for mod enchantment support