file upload to API (doesn't work yet)
Merge branch 'master' of https://github.com/Automattic/sulfur

Conflicts:
	app/uploader.js