New config option & refactoring

Just something I did in a few minutes for my server... Should default to no changes of behavior, might have removed a needed work around (I'll look into that at a later date), not sure...