Merge

Clean up the configs... readded the client mods