Added some features from my primary .emacs file