Got rid of separate settings/* directory by merging it into the plugin groupings in which they're defined (along with removing a lot of crap). Started a separate file called mappings.vim that needs significant work but will eventually hold alphabetical mappings.