No longer using powerline.
Merge branch 'master' of github.com:socketwiz/dotfiles