Modifications for work computer (RVM)
Update gitmessage
Update aliases for git stash and vim
Updates
Remove Rails-specific Hirb setting from pryrc
Fix modularization mistakes
Add Farespotter project alias
Fix git prompt wrapping in Zshell
Update gitconfig, vim alias

Conflicts:
	home/gitconfig.local
	shell/aliases.sh