update travis conf (again)
Merge remote-tracking branch 'origin/grar-mvc' into grar-mvc