Fixing for backbone 1.1 changes (no more this.options)
Rebasing + recompiling