Updgrade conf for fish2.0 and some gitconf as well