Update git & atom config
Update zsh aliases
Merge branch 'master' of github.com:Calyhre/dotfiles