Added emacs
Merge branch 'master' of github.com:SKoschnicke/development-environment-formula

Conflicts:
	salt/roots/emacs.sls