add momentjs for formatting the date
Merge branch 'master' of github.com:Automattic/sulfur

Conflicts:
	app/models/file.js
Merge branch 'master' of github.com:Automattic/sulfur
make the image meta not break stuff when the type isn't an image
Merge branch 'master' of github.com:Automattic/sulfur