Got rid of feed_hash nonsense, updates now keyed on url
Merge branch 'master' of https://github.com/poisonspur/candygram

Conflicts:
	candygram.py