Moved maxchans to chanserv{} block
Update maxnicks to be part of NickServ
Update conf for maxchans/maxnicks
Fix merge