up
Merge branch 'master' of github.com:crackcell/emacs-plugins