Do the upload in the parent addon script rather than from content
Remove extraneous header, point to metrics endpoint
Merge pull request #511 from mozilla/fubar

Do the upload in the parent addon script rather than from content
Merge branch 'master' into feature/first-run

Conflicts:
	lib/main.js