Merge pull request #10 from lightsofapollo/promises

Bug 941355 - Promises
Bug 943601 - greatly improve configuration bootstrap (only one codepath now)