Fix whitespace and travis errors