rvm update in install.sh
Merge branch 'master' of http://github.com/ushu/dotfiles

Conflicts:
	install.sh