Revert "Revert "Merge pull request #84 from GoogleChrome/big-bang""

This reverts commit 2f46fffa5a75921118feebc744bbc193efedc326.