added sml plugins to emacs
Merge branch 'master' of https://github.com/Errorific/dotfiles
Merge branch 'master' of https://github.com/Errorific/dotfiles

Conflicts:
	emacs/init.el
mergin