Add alias gfp for 'git fetch --prune'
Add rvm_prompt_info to prompt
Merge branch 'master' of github.com:unimatrixZxero/oh-my-zsh into my_fork

Conflicts:
	plugins/git/git.plugin.zsh