Updating json to return self.conf to avoid race condition
Making test async
Removing extra space
Merge branch 'master' of github.com:component/builder.js into conf-race
Merge pull request #71 from calvinfo/conf-race

Updating json to return self.conf to avoid race condition