other powerline
conflicting changes
Merge branch 'master' of github.com:gmickel/dotfiles