updating submodules
buff-menu+ is no longer: i do not use it anyway and it is not working (emacs 24.3-1)
merge