Merge branch 'development' into issues/12
Use z.sh instead of autojump closed #12

- Remove 'setopt complete_aliases` since it conflicts with z.sh
Merge branch 'issues/12' into development
Merge branch 'development'