More emacs init cleanup; move evil config back into main file.
Yet more cleanup; and moving org back into main config.