Add alias for vi -> vim
Add zsh custom folder with new jira plugin.
Merge with master