Made merge only happen if comics downloaded
Dictionary for text editors spelling
Various setting changes that I don't know where they came from