resolved git editor conflict
added zsh plugins - brew copydir dirhistory themes
removed homeshick auto pull, it was annoying
moved git email into separate untracked file and created init script to configure it