Rebuild from coffee with just the coffee upgrade and no header changes.
Re-do our header changes in the coffee file where they belong.
Rebuild our javascript with coffee 1.6.3.
Add our Array.filter polyfill to the coffeescript source.
Merge branch 'filter-polyfill'
Merge branch 'json-headers'

Conflicts:
	ooyala_uploader.js