some emacs and screenc stuff
Merge branch 'master' into desktop