fixed function names, cleaned up wrong merge, defaulted daysAgo to 0
Process last 2 weeks of history for general interests
Merge branch 'master' of github.com:Mardak/up-central
Merge branch 'master' of github.com:Mardak/up-central

Conflicts:
	toolkit/components/places/Interests.js