Fixed git prompt and changed aliases