Revert "setting up travis to NOT run on 2.5.x branch"

This reverts commit bb4f2324df4486e5516d4e364acfbefda9790caa.