Simplify the loading of files in the filelist view
Merge branch 'master' of https://github.com/Automattic/sulfur

Conflicts:
	app/views/filelist.js
Merge branch 'master' of https://github.com/Automattic/sulfur