Updated .emacs.d after moving to melpa-stable
Merged master