more cleanup
Merge branch 'results' of https://github.com/EverythingMe/gaia into results

* 'results' of https://github.com/EverythingMe/gaia:
  Fixed load more in SmartFolder

Conflicts:
	apps/homescreen/everything.me/js/Brain.js
	apps/homescreen/everything.me/modules/Results/ResultManager.js