Rebase from svn, add Config.pm, Changes