merged various changes from different machines after nuking my local
added ac-comphist.dat
added ac-comphist.dat
merged