Some code style fixes and travis-ci config changes.