Upgraded marionette to 2.2.1
Merge branch 'master' of github.com:chrisf74/backbone-rails-template
Merging