move some more stuff to melpa