took out powerline
Merge branch 'master' of github.com:roseperrone/dotfiles