Powerline config override
Merge branch 'master' of github.com:borisguery/dotfiles