Added marionette to jam dependencies
Merge branch 'master' of github.com:mikeybox/marionette-boilerplate