updates to this including ESS
Merge branch 'catchup'

Conflicts:
	.emacs-custom.el
	.emacs.el
	opt/emacs/packages/globalff.el
	opt/emacs/site-lisp/snippets.el