       kept-old-versions 2
       version-control t)       ; use versioned backups
 
-(global-set-key (kbd "M-RET") 'electric-buffer-list)
-(global-set-key (kbd "C-M-j") 'electric-buffer-list)
+;(global-set-key (kbd "M-RET") 'electric-buffer-list)
+;(global-set-key (kbd "C-M-j") 'electric-buffer-list)
+(global-set-key (kbd "M-RET") 'ivy-switch-buffer)
+(global-set-key (kbd "C-M-j") 'ivy-switch-buffer)
 
 (add-hook 'Buffer-menu-mode-hook 'buffer-disable-undo)
 

;;
(use-package multi-term :ensure t)

(use-package projectile
  :ensure t
  :config (projectile-global-mode t)

  (setq perspeen-use-tab t)
  :config
  (perspeen-mode))

(use-package popwin :ensure t)

