Changed so data_loading and cache_loading are completely separate
events.

If data loading is on, auto-loads from data directory. If cache
loading is on, auto-loads from cache directory. Cache loading still
happens first, so if there are name clashes, cache takes precedence.