Modifying zsh settings
Merge branch 'master' of https://github.com/chaddotson/my-settings