Reconfig how it should be

@zaach - this PR can't be merged, but this is how I thought the promises should chain together. Check out `app/lib/fxa-client.js`