Updated travis file.. again..
Merge branch 'master' of https://github.com/opengovfoundation/madison