remove powerline stuff (not using powerline anymore at this time)
Merge branch 'master' into lightweight