Moved a LOT of stuff around in the Emacs config

Small change to xinitrc too