Fixed name of emacs-nox
Merge branch 'master' of github.com:tdf/salt-states-base

Conflicts:
	editor/map.jinja