added rvm and git-prompt
Merge branch 'master' of https://github.com/brndmg/setup

Conflicts:
	setup.sh