Updated to the new 2.x

Updated to the new 2.x Essentials branch. My Git wasn't working properly for some reason and refused to update.