Merge pull request #57 from Alex-hawks/master

Fix the merges
Add config options for the cow haters
NEI
update 1.3
1.3.1 had to delete the unofficial lang

it crashed smp
hotfix for UE
UE 1.2.3 BETA
I have pulled your git Matt...