git prompt and various colour improvements