Delete deploy-time-generated app.js file.

It seems to me that file app.js needn't be under source control, since it is automatically generated from app.coffee when the site is generated.