more changes for powerline and git