saving before breaking elisp apart into directories
remove auto-save-list stuff
excluding system-specific caching that changes frequently
org customizations
broke the rest out
switched athena-specific customizations to only load with F5
exclude athena customizations from repository
exclude files named athena* from commits
windows customizations only occur on windows machines
fixed loading athena keyboard shortcut
resolved merge conflicts