Be consistent about spacing
Add rvm ruby version as per @i8ramin in #89
Merge branch 'master' into add-rvm-to-prompt

Conflicts:
	zsh/prompt.zsh
Merge pull request #92 from jacobwg/add-rvm-to-prompt

Display ruby version from rvm in the prompt, function-extracted