Revert "Revert to old travis file"

This reverts commit 1db8b421ebc9f0360d901767a60302653463e452.
Incorporate module changes