added some stuff from oh-my-emacs