Fix update.php logic for logged-in users
Fix update.php logic for logged-in users
Merge branch 'master' of beesbuzz.biz:git.beesbuzz.biz/FeedOnFeeds

Conflicts:
	update.php
Change max update interval to 2 days, set prediction based on last item stamp instead of now
Wait, no, that's stupid
Merge branch 'master' of https://github.com/RomanSixty/Feed-on-Feeds

Conflicts:
	fof-main.php
Made similarity purging optional.

In my installation, the similarity purging step was taking longer than 30 seconds and never actually removing anything, causing things to time out badly.

While I was at it I fixed some formatting and cleaned up some other code.