MErge

Clean configs....
deleted 1207
updated certain client side mods