Merge schema.
Remove coffeescript comments that caused compilation error (not using coffeescript).
Removed unneeded schema change.
Merge pull request #69 from bgrayless/fix_assets_on_staging

Fix assets on staging - coffeescript compilation conflict