Yaml mode.
Disable tabs for ruby.
Merge branch 'master' of github.com:ibrahima/dotfiles

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