Merge pull request #12 from lightsofapollo/multiclient

Bug 898014 - Multiclient / Profile Overrides
Bug 898022 - Marionette plugins