Simplify the modular config
I have moved to a more simple config that loads all .el files in a givin
directory. This is more likely to stay consistent since I do not need to
run a command to merge the config files into a single config file. This
is done at the expense of startup speed though. I should look into byte
compiling files to speed up loading the files.
Misc config file changes.