Update travis config and minor CS fixes