Updating changes for evil mode (and init.el controls instead of .emacs)