Refactor to use marionette 0.9 apis
Merge pull request #13 from lightsofapollo/refactoring-to-marionette-0.9

Refactor to use marionette 0.9 apis