Add sml-mode options
Merge branch 'master' of github.com:ramLlama/emacs-d

Conflicts:
	init.el