fixed bash_profile so rvm works ok
Merge branch 'master' of github.com:izbor/vimrc

Conflicts:
	.bash_profile
Merge branch 'master' of github.com:izbor/vimrc

Conflicts:
	.bash_profile