Requesting a pull to mozillafordevelopment:master from k88hudson:makedrive

the problem with that is that model still gets instantiated, and in a non-browser environment it will throw errors (i.e. it will automatically try to connect)