Added rvm to bashrc
Added a rails-specific testing alias
Add VIRTUAL_ENV var to zsh prompt
Merge