tidy up vim edit and git prompt