Requesting a pull to mozillafordevelopment:master from k88hudson:makedrive

i want to be able to instantiate it once for the app but still be able to create an isolated test instance with different options etc. kinda weird i know, open to suggestions here