Merge into work. Fix bad remotes & powerline symbol bug.