Merge pull request #74 from TechCavern/master

Update AE2 with ExtraCells and Thaumic Energistics
Update AE2 to fix crash bug