First hack at it
Merge branch 'master' of github.com:icoloma/dotfiles

Conflicts:
	ruby/install.sh