Updated configuration.

Added a few new modes from ELPA (need to update README and reflect this).
- Too much other changes to remember.
Updated configuration files.
Updated config files.