Oss sync

This syncs the internal view to the OSS view. Mostly the PR is so we can run it through TravisCI