Update Travis script with layout changes and build matrix update.