Fix master branch on mac
Merge branch 'master' of github.com:jtwp470/dotemacs

Conflicts:
	ac-comphist.dat
New f- something files