Update bootstrap and travis setup