updated .emacs to use melpa and added org mode stuff