Add a few more packages. Reinclude everything that wasn't working.
Remove evil git repo.
Treat dot emacs as a proper piece of software.
Commit prior to merge.
Update.