Fix for Backbone Marionette remaining issues

I've put in the fixes requested for #294 ... let me know if I missed any, but I think I got them all.

-

Fixes #294