Fixed issues with RVM setup
Merge branch 'master' of github.com:dreamiurg/bash-ext

Conflicts:
	aliases.sh
	zshrc