New aliases for git
Add rprompt a la Vim
Merge branch 'master' of github.com:TaurusOlson/dotfiles

Conflicts:
	git/aliases.zsh
Fix permission for system/