ac modes.
Merge branch 'master' of github.com:gbarnett/emacs-slim

Conflicts:
	init.el