Travis-ci should now work properly again.

.travis.yml is back to a previous stable version and all changes made since last non-working version were integrated into it.