added alfred feed in feeds.conf
added alfred feed in Makefile
added alfred to genconfig
Merge branch 'alfred' of https://github.com/egon0/ff-advanced into egon0-alfred

Conflicts:
	feeds.conf