Turn off snippets.
Merge branch 'master' of github.com:brettviren/dot-emacs

Conflicts:
	init.el