-;;(load-file "~/.emacs.d/emacs-for-python/epy-init.el")
-
 (add-to-list 'load-path "~/.emacs.d/")
 (add-to-list 'load-path "~/.emacs.d/plugins/")
+;(add-to-list 'load-path "~/.emacs.d/ido-ubiquitous/")
 (add-to-list 'load-path "~/.emacs.d/ecb-snap/")
 ;;(add-to-list 'load-path "~/.emacs.d/cedet-1.0.1/")
+
+(load (expand-file-name "~/.emacs.d/elpa/package.el"))
+(add-to-list 'package-archives '("marmalade" . "http://marmalade-repo.org/packages/"))
+(package-initialize)
+
 (load-file "~/.emacs.d/emacs-for-python/epy-init.el")
+
+
+(ido-ubiquitous-mode t)
+
+(smex-initialize)
+(global-set-key (kbd "M-x") 'smex)
+(global-set-key (kbd "M-X") 'smex-major-mode-commands)
+(global-set-key (kbd "C-c C-c M-x") 'execute-extended-command) ;; the old M-x.
 
 ;;(require 'ido)
 ;;(ido-mode t)

;;(global-set-key [mouse-4] 'scroll-down-in-place)
;;(global-set-key [mouse-5] 'scroll-up-in-place)
(global-set-key [C-up] 'scroll-down-in-place)
(global-set-key [C-down] 'scroll-up-in-place)
(global-set-key (kbd "C-<next>") 'previous-buffer) ;; page down

(global-set-key (kbd "C-f") 'isearch-forward)
(global-set-key (kbd "C-f") 'isearch-repeat-forward)
(global-set-key (kbd "C-S-f") 'isearch-backward)
(global-set-key (kbd "C-S-f") 'isearch-repeat-backward)

(global-set-key (kbd "C-M-<prior>") 'isearch-ring-retreat)
(global-set-key (kbd "C-M-<next>") 'isearch-ring-advance)

(global-set-key (kbd "C-s") 'save-buffer)
(global-set-key (kbd "C-w") 'kill-this-buffer)
(global-set-key (kbd "C-b") 'ido-switch-buffer)
