Major changes, added org mode. Changed preferences for Mac only using GNU emacs.