Update marionette js stack
Merge pull request #24 from colemanw/master

Update marionette js stack