Updating Change Log / Files

Updating to include some of JZ's updates.
Mekanism not included because I don't see Aidan's name in any commits. Generally, I don't like using "fixes" from other devs outside of Aidan unless Aidan has his name in one of the commits. Too sketchy.