Update travis build
Make Travis build simpler