Load terminal settings after activation.
Moved settings to defaults.el
Moved ediff settings to modes.el
Cleanup: File reformatting
Additional ignores
Cleanup: Removal of commented section; unnecessary code