Formatting cleanup per our conventions.
Update Travis-CI configuration.