Changed to userconf

changed all the old conf files to a master user conf, left in all the
commented old code.