Updated branch with latest fixes/changes from 1.7.10.

Applied the following commits from 1.7.10 branch

MinecraftPortCentral/Cauldron@6eea3024612e200714e5b242dbdc54e5edb2471f
MinecraftPortCentral/Cauldron@21927d529d0f53b24f1f3552c265be16de27f5a8