added marionette var in AMD function signature; renamed marionette module name
Merge pull request #1 from richterm/master

marionette var in AMD function signature; renamed marionette module name