removed feeds.conf from gitignore, changed all branch in feeds config to test