various changes
Merge branch 'master' of https://github.com/onthestairs/emacs.d
add ess