merged in oh-my-zsh and a powerline theme