Code review: 179140043: Issue 3: Clean-up, and making changes to TravisCI and re-enabling preg tests.