Trying travis again...

This reverts commit 8c30821db91756715f262d5a4ae2d15a4456acdb.