Make fixes for #50 and #51 toggleable

Adds config options in case server owners don't want to strip suffix or want redundant modes