Add feeds.conf to svn:ignore, because it's a user config file. feeds.conf.default...