Updated lib/emacs/general.el to include MELPA repository, and popwin.