Updated files untouched from Divi 2.1.2 (Ian's changes not applied yet)
Reapplied Ian's changes to the core Divi theme. Added comments.