working on the backbone/marionette pieces.
Merge branch 'master' of https://github.com/MusiWiz/rubywiz