merge emacs_rocks.el between bil-desktop and org master