added flexget config files
cleanup merge