Merge branch 'vendor' -- vendored everything from my source except for 'web repo', which I'll handle separately.