Add smex.
Some ruby settings, dunno where they came from.
Merge branch 'master' of github.com:ibrahima/dotfiles

Conflicts:
	.emacs.d/my-packages.el