misc changes
Merge branch 'master' of github.com:alexkhesin/ak-emacs