Merge pull request #4 from michael-smith/master

Git alias cleanup and zsh eof fix
Enable full VIM editing of command line with 'v' like with Bash.
SublimeText 3
Remove rbenv from prompt
Change default git diff to patience
Merge branch 'matthughes-master'

Conflicts:
        zsh/zshrc.symlink
Scalaz upgrade
Update tmux split commands to use new support for cwd preservation